ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitAna/TreeMod/src/HLTMod.cc
(Generate patch)

Comparing UserCode/MitAna/TreeMod/src/HLTMod.cc (file contents):
Revision 1.9 by loizides, Tue May 12 18:41:43 2009 UTC vs.
Revision 1.14 by loizides, Tue Sep 15 14:48:36 2009 UTC

# Line 5 | Line 5
5   #include <TTree.h>
6   #include "MitAna/DataTree/interface/Names.h"
7   #include "MitAna/DataTree/interface/TriggerName.h"
8 + #include "MitAna/DataTree/interface/TriggerMask.h"
9   #include "MitAna/DataTree/interface/TriggerObject.h"
10 + #include "MitAna/DataTree/interface/TriggerObjectCol.h"
11 + #include "MitAna/DataTree/interface/TriggerObjectsTable.h"
12  
13   using namespace mithep;
14  
# Line 16 | Line 19 | HLTMod::HLTMod(const char *name, const c
19    BaseMod(name,title),
20    fAbort(kTRUE),
21    fPrintTable(kFALSE),
22 +  fIgnoreBits(kFALSE),
23 +  fObjMode(kHlt),
24    fBitsName(Names::gkHltBitBrn),
25    fMyObjsNamePub(Form("%sTrigObjs", name)),
26    fBits(0),
# Line 55 | Line 60 | void HLTMod::AddTrigObjs(UInt_t tid)
60    const BitMask256 &ba = fTrigBitsAnd.at(tid);
61    const BitMask256 &bm = fTrigBitsCmp.at(tid);
62    for (UInt_t i=0; i<bm.Size(); ++i) {
63 <    if (ba.TestBit(i)==0)
63 >    if (ba.TestBit(i)==0 && !fIgnoreBits)
64        continue; // not an active trigger bit
65      if (fBitsDone.TestBit(i))
66        continue; // objects for this bit are already obtained
# Line 63 | Line 68 | void HLTMod::AddTrigObjs(UInt_t tid)
68        continue; // excluded trigger bit (ie a !trgname)
69  
70      const TList *list = fTrigObjs->GetList(i);
71 <    fMyTrgObjs->Add(list);    
71 >
72 >    TIter iter(list->MakeIterator());
73 >    const TriggerObject *to = dynamic_cast<const TriggerObject*>(iter.Next());
74 >    while (to) {
75 >      if ( (fObjMode == kAll) ||
76 >           ((fObjMode==kHlt) && (to->IsHLT())) ||
77 >           ((fObjMode==kL1) && (to->IsL1())) )
78 >        fMyTrgObjs->Add(to);    
79 >      to = dynamic_cast<const TriggerObject*>(iter.Next());
80 >    }
81      fBitsDone.SetBit(i);
82    }
83   }
# Line 82 | Line 96 | void HLTMod::BeginRun()
96    for (UInt_t i=0; i<fTrigNames.size(); ++i) {
97      BitMask256 tmask; //trigger mask
98      BitMask256 amask; //bitand mask
99 +    Bool_t gotamask = 0;
100      TString names(fTrigNames.at(i).c_str());
101  
102      TObjArray *arr = names.Tokenize("&");
# Line 101 | Line 116 | void HLTMod::BeginRun()
116            Warning("BeginRun", "Trigger %s not found.", sptr);
117            continue;
118          }
119 +        gotamask = 1;
120          UShort_t bit = tn->Id();
121          amask.SetBit(bit); //always set and-mask bit
122          if (!invert)
# Line 108 | Line 124 | void HLTMod::BeginRun()
124        }
125        delete arr;
126      }
127 <    fTrigBitsAnd.push_back(amask);
128 <    fTrigBitsCmp.push_back(tmask);
127 >    if (gotamask) {
128 >      fTrigBitsAnd.push_back(amask);
129 >      fTrigBitsCmp.push_back(tmask);
130 >    }
131    }
132   }
133  
# Line 185 | Line 203 | void HLTMod::SlaveTerminate()
203   {
204    // Save number of accepted events.
205  
206 <  SaveNEventsProcessed();
206 >  SaveNEventsProcessed("hDHLTEvents");
207   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines