Changeset 72 in svn for trunk/interface

Timestamp:

Dec 3, 2008, 12:01:04 PM (16 years ago)

Author:

severine ovyn

Message:

final trigger

Location:

trunk/interface

Files:

• SmearUtil.h (modified) (1 diff)
• TriggerUtil.h (modified) (4 diffs)

trunk/interface/SmearUtil.h

@@ -98 +98 @@
   int MISTAGGING_L; 
   
+  //trigger flag
+  int DOTRIGGER;
+
   double CONERADIUS;
   int JETALGO;

trunk/interface/TriggerUtil.h

@@ -14 +14 @@
 #include <vector>
 #include "TLorentzVector.h"
+#include "TClonesArray.h"
 
 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
 #include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
+#include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
 
 using namespace std;
@@ -31 +33 @@
   void PrintTrigCondition(string LogName,int i);
 
-  bool GetResult() {
-    if(!has_been_evaluated) Evaluate(event_i);
-    return Result;
-  };
+  bool GetResult(TClonesArray *branchElecTrig, TClonesArray *branchMuonTrig,
+      TClonesArray *branchJetTrig, TClonesArray *branchTauJetTrig,
+      TClonesArray *branchPhotonTrig,  TClonesArray *branchETmisTrig);
 
  private:
-  bool Evaluate(int event_i); // <- Ã  la fin, mettre has_been_evaluated=true;
-
+  
   vector<float> GetCuts(const vector<string> &Sequences);
   vector<float> ElecValues;
@@ -47 +47 @@
   vector<float> GammaValues;
   bool Result;
-  int event_i;
-  bool has_been_evaluated;
 };
 
@@ -68 +66 @@
   // appelle la méthode TriggerBit::PriniTrigCondition
   
-
-  bool GetGlobalResult() {
-    if (! has_been_evaluated) Evaluate(event_i);
-    return GlobalResult;
-  }
+  bool GetGlobalResult(TClonesArray *branchElecTrig, TClonesArray *branchMuonTrig,
+      TClonesArray *branchJetTrig, TClonesArray *branchTauJetTrig,
+      TClonesArray *branchPhotonTrig, TClonesArray *branchETmisTrig,ExRootTreeBranch *branchTrigger);
 
   void WriteResult();