Changeset 264 in svn for trunk/src/TriggerUtil.cc

Timestamp:

Feb 11, 2009, 10:22:30 AM (15 years ago)

Author:

Xavier Rouby

Message:

first test 2.0

File:

• trunk/src/TriggerUtil.cc (modified) (14 diffs)

trunk/src/TriggerUtil.cc

@@ -132 +132 @@
 
 //*************************************************************************
+TriggerBit::TriggerBit() {
+}
 
 TriggerBit::~TriggerBit() {
@@ -143 +145 @@
         EtmisValues.clear();
         GammaValues.clear();
-
 }
 
@@ -153 +154 @@
         IElecValues.push_back(tb.IElecValues[i]);
 
-
   for(unsigned int i=0; i<tb.MuonValues.size(); i++)
         MuonValues.push_back(tb.MuonValues[i]);
@@ -165 +165 @@
   for(unsigned int i=0; i<tb.BjetValues.size(); i++)
         BjetValues.push_back(tb.BjetValues[i]);
-
 
   for(unsigned int i=0; i<tb.TauJetValues.size(); i++)
@@ -218 +217 @@
       TClonesArray *branchPhotonTrig,  TClonesArray *branchETmisTrig)
 {
-
   TSimpleArray<TRootJet> bjets=SubArrayBjets(branchJetTrig);
   TSimpleArray<TRootElectron> Ielectron=SubArrayIElec(branchElecTrig);
   TSimpleArray<TRootMuon> Imuon=SubArrayIMuon(branchMuonTrig);
- 
+
   int elec_size = ElecValues.size();
   int Ielec_size = IElecValues.size();
@@ -263 +261 @@
         }
 
-
       if(muon_size!=0){
         TRootMuon *muon;
@@ -287 +284 @@
            if(jet->PT < JetValues[i])Result=false;}}
 
-      if(jet_size!=0){
-        TRootJet *jet;
-        for(int i=0;i<jet_size;i++){
-           jet = (TRootJet*)branchJetTrig->At(i);
-           if(jet->PT < JetValues[i])Result=false;}}
-
       if(bjet_size!=0)
         {
@@ -304 +295 @@
         }
 
-
       if(taujet_size!=0){
         TRootTauJet *taujet;
@@ -338 +328 @@
   vector<string> BjetSequences;
 
-///  char *result =NULL;
   char * result = new char[256];
   result = strtok( (char*) trigger_algorithm.c_str(),"&");
@@ -354 +343 @@
        result = strtok( NULL,"&");
      }
-  delete result;
+  delete [] result;
 
   ElecValues = GetCuts(ElecSequences);
@@ -368 +357 @@
 }
 
+
 void TriggerBit::PrintTrigCondition(const string& LogName,const int i) 
 {
@@ -379 +369 @@
   int etmis_size = TriggerBit::EtmisValues.size();
   int bjets_size = TriggerBit::BjetValues.size();
-  
+
   ofstream f_out(LogName.c_str(),ios::app);
 
@@ -439 +429 @@
    }
   return OrderedValue;
+
 }
 
@@ -480 +471 @@
 }
 
-