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

Comparing UserCode/MitAna/TreeMod/src/Analysis.cc (file contents):
Revision 1.35 by loizides, Mon Jul 13 20:05:31 2009 UTC vs.
Revision 1.36 by loizides, Tue Aug 11 15:24:39 2009 UTC

# Line 46 | Line 46 | Analysis::Analysis(Bool_t useproof) :
46    fChain(0),
47    fSet(0),
48    fDeleteList(new TList),
49 –  fTreeName(Names::gkEvtTreeName),
49    fCompLevel(7),
50    fProof(0),
51    fDoNEvents(TChain::kBigNumber),
52    fSkipNEvents(0),
53    fPrintScale(1),
54 <  fCacheSize(-1)
54 >  fCacheSize(-1),
55 >  fTreeName(Names::gkEvtTreeName),
56 >  fEvtHdrName(Names::gkEvtHeaderBrn),
57 >  fRunTreeName(Names::gkRunTreeName),
58 >  fRunInfoName(Names::gkRunInfoBrn),
59 >  fAllEvtHdrBrn(Names::gkAllEvtHeaderBrn),
60 >  fLATreeName(Names::gkLATreeName),
61 >  fLAHdrName(Names::gkLAHeaderBrn),
62 >  fHLTTreeName(Names::gkHltTreeName),
63 >  fAllEvtTreeName(Names::gkAllEvtTreeName),
64 >  fHLTObjsName(Names::gkHltObjBrn)
65   {
66    // Default constructor.
67  
# Line 78 | Line 87 | Analysis::~Analysis()
87    delete fDeleteList;
88    delete fSelector;
89    delete fSuperMods;
90 <  fOutput    = 0;   // owned by TAM
90 >  fOutput = 0;   // owned by TAM
91  
92    delete fProof;
93   }
# Line 436 | Line 445 | Bool_t Analysis::Init()
445    HLTFwkMod *hltmod = 0;
446    if (fUseHLT) {
447      hltmod = new HLTFwkMod;
448 +    hltmod->SetHLTObjsName(GetHLTObjsName());
449 +    hltmod->SetHLTTreeName(GetHLTTreeName());
450      fDeleteList->Add(hltmod);
451    }
452  
# Line 458 | Line 469 | Bool_t Analysis::Init()
469    } else {
470  
471      // when not running Proof, we must make a selector
472 <    fSelector = new Selector;
473 <    fSelector->SetDoProxy(fDoProxy);
474 <    fSelector->SetDoObjTabClean(fDoObjTabClean);
475 <
476 <    fSelector->AddInput(anamod);
472 >    Selector *sel = new Selector;
473 >    sel->SetDoProxy(fDoProxy);
474 >    sel->SetDoObjTabClean(fDoObjTabClean);
475 >    sel->SetDoRunInfo(kTRUE);
476 >    sel->SetAllEvtHdrBrn(GetAllEvtHdrBrn());
477 >    sel->SetAllEvtTreeName(GetAllEvtTreeName());
478 >    sel->SetEvtHdrName(GetEvtHdrName());
479 >    sel->SetLAHdrName(GetLAHdrName());
480 >    sel->SetLATreeName(GetLATreeName());
481 >    sel->SetRunInfoName(GetRunInfoName());
482 >    sel->SetRunTreeName(GetRunTreeName());
483 >    sel->AddInput(anamod);
484 >    fSelector = sel;
485  
486      if (hltmod)
487        fSelector->AddInput(hltmod);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines