Changeset 70 in svn

Timestamp:

Dec 2, 2008, 8:50:30 PM (16 years ago)

Author:

severine ovyn

Message:

remove bug trigger

Location:

trunk

Files:

• Delphes.cpp (modified) (5 diffs)
• Utilities/ExRootAnalysis/interface/BlockClasses.h (modified) (2 diffs)
• Utilities/ExRootAnalysis/src/BlockClasses.cc (modified) (1 diff)

trunk/Delphes.cpp

@@ -29 +29 @@
 #include "interface/VeryForward.h"
 #include "interface/JetUtils.h"
-
 
 #include <vector>
@@ -346 +345 @@
       // Should test all the trigger table on the event, based on reconstructed objects
       treeWriter->Fill();
-     
+      
     } // Loop over all events
-
-
+  
   treeWriter->Write();
   delete treeWriter;
-
+  
   if(DET->DOTRIGGER == 1) 
     {
@@ -358 +356 @@
       chainT.Add(outputfilename.c_str());
       ExRootTreeReader *treeReaderT = new ExRootTreeReader(&chainT);
-
+      
       const TClonesArray *branchElecTrig = treeReaderT->UseBranch("Electron");
       const TClonesArray *branchMuonTrig = treeReaderT->UseBranch("Muon");
@@ -365 +363 @@
       const TClonesArray *branchPhotonTrig = treeReaderT->UseBranch("Photon");
       const TClonesArray *branchETmisTrig = treeReaderT->UseBranch("ETmis");
-  
+      
       ExRootTreeWriter *treeWriterT = new ExRootTreeWriter(outputfilename, "Trigger");
-      ExRootTreeBranch *branchTrigger = treeWriterT->NewBranch("Trigger", TRootTrigger::Class());
-
+      ExRootTreeBranch *branchTrigger = treeWriterT->NewBranch("TrigResult", TRootTrigger::Class());
+      
       TRootTrigger *elementTrigger;
-
-     Long64_t entryT, allEntriesT = treeReaderT->GetEntries();
-     cout << "** Chain contains " << allEntriesT << " events" << endl;
-     for(entryT = 0; entryT < allEntriesT; ++entryT)
+      
+      Long64_t entryT, allEntriesT = treeReaderT->GetEntries();
+      cout << "** Chain contains " << allEntriesT << " events" << endl;
+      for(entryT = 0; entryT < allEntriesT; ++entryT)
         {
-          treeWriterT->Clear();
-//          treeReaderT->ReadEntry(entry);
+          treeWriterT->Clear();
+          treeReaderT->ReadEntry(entry);
           elementTrigger = (TRootTrigger*) branchTrigger->NewEntry();
-          elementTrigger->Accepted=true;
+          elementTrigger->Accepted=1;
           treeWriterT->Fill();
         }
-
-    treeWriterT->Write();
-    delete treeWriterT;
-   }
-
+      
+      treeWriterT->Write();
+      delete treeWriterT;
+    }
+  
   cout << "** Exiting..." << endl;
   
@@ -391 +389 @@
   delete DET;
   if(converter) delete converter;
-
+  
   todo("TODO");
 }

trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

@@ -13 +13 @@
  *  present in the data members of the Block TRoot class.
  *
- *  $Date: 2008-12-02 11:14:45 $
- *  $Revision: 1.4 $
+ *  $Date: 2008-12-02 19:50:30 $
+ *  $Revision: 1.5 $
  *
  *  
@@ -287 +287 @@
 };
 
-//---------------------------------------------------------------------------
-
 class TRootTrigger: public TSortableObject
 {
 public:
   TRootTrigger() {};
-    static TCompare *fgCompare; //!
-
-  bool Accepted;
-  bool GlobalAccepted;
+
+  bool Accepted; // -1 or 1
+
+  static TCompare *fgCompare; //!
+  const TCompare *GetCompare() const { return fgCompare; }
 
   ClassDef(TRootTrigger, 1)
-
 };
 //---------------------------------------------------------------------------

trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc

@@ -11 +11 @@
  *  to preserve mother-dautherlinks between particles.
  *
- *  $Date: 2008-12-02 11:14:45 $
- *  $Revision: 1.2 $
+ *  $Date: 2008-12-02 19:50:30 $
+ *  $Revision: 1.3 $
  *
  *