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

Comparing UserCode/MitAna/TreeMod/src/AnaFwkMod.cc (file contents):
Revision 1.16 by bendavid, Fri Jul 22 18:21:02 2011 UTC vs.
Revision 1.18 by bendavid, Wed May 30 16:23:54 2012 UTC

# Line 98 | Line 98 | void AnaFwkMod::CopyAllEventHeaders()
98        return;
99      }
100      fAllHeadTree->GetEntry(fCurEnt++);
101 <    while(fCurEnt<=nemax && fAllEventHeader->Skimmed()) {
101 >    while (fCurEnt <= nemax && fAllEventHeader->Skimmed()) {
102        EventHeader *eh = fAllHeaders.AddNew();
103 <      eh->SetRunNum(fAllEventHeader->RunNum());
104 <      eh->SetEvtNum(fAllEventHeader->EvtNum());
105 <      eh->SetLumiSec(fAllEventHeader->LumiSec());
103 >      eh->SetRunNum  (fAllEventHeader->RunNum());
104 >      eh->SetEvtNum  (fAllEventHeader->EvtNum());
105 >      eh->SetLumiSec (fAllEventHeader->LumiSec());
106        eh->SetRunEntry(fAllEventHeader->RunEntry());
107 <      eh->SetSkimmed(fAllEventHeader->Skimmed());
107 >      eh->SetSkimmed (fAllEventHeader->Skimmed());
108        fAllHeadTree->GetEntry(fCurEnt++);
109      }
110 <    if ((fAllEventHeader->RunNum()!=curev->RunNum())   ||
111 <        (fAllEventHeader->EvtNum()!=curev->EvtNum())   ||
112 <        (fAllEventHeader->LumiSec()!=curev->LumiSec()) ||
113 <        (fAllEventHeader->RunEntry()!=curev->RunEntry())) {
110 >    if ((fAllEventHeader->RunNum()   != curev->RunNum())   ||
111 >        (fAllEventHeader->EvtNum()   != curev->EvtNum())   ||
112 >        (fAllEventHeader->LumiSec()  != curev->LumiSec())  ||
113 >        (fAllEventHeader->RunEntry() != curev->RunEntry())) {
114        SendError(kWarning, "CopyAllEventHeaders",
115                  "Event header information for entry %d inconsistent: "
116                  "%d==%d, %d==%d, %d==%d, %d==%d",
# Line 126 | Line 126 | void AnaFwkMod::CopyAllEventHeaders()
126      if (fCurEnt<nemax) {
127        Int_t testEnt = fCurEnt;
128        fAllHeadTree->GetEntry(testEnt++);
129 <      while(testEnt<=nemax && fAllEventHeader->Skimmed())
129 >      while (testEnt<=nemax && fAllEventHeader->Skimmed())
130          fAllHeadTree->GetEntry(testEnt++);
131        if (testEnt==nemax+1) { // need to add remaining skimmed events
132          fAllHeadTree->GetEntry(fCurEnt++);
133          while(fCurEnt<=nemax) {
134            EventHeader *eh = fAllHeaders.AddNew();
135 <          eh->SetRunNum(fAllEventHeader->RunNum());
136 <          eh->SetEvtNum(fAllEventHeader->EvtNum());
137 <          eh->SetLumiSec(fAllEventHeader->LumiSec());
135 >          eh->SetRunNum  (fAllEventHeader->RunNum());
136 >          eh->SetEvtNum  (fAllEventHeader->EvtNum());
137 >          eh->SetLumiSec (fAllEventHeader->LumiSec());
138            eh->SetRunEntry(fAllEventHeader->RunEntry());
139 <          eh->SetSkimmed(fAllEventHeader->Skimmed());
139 >          eh->SetSkimmed (fAllEventHeader->Skimmed());
140            fAllHeadTree->GetEntry(fCurEnt++);
141          }
142          if (fCurEnt != nemax+1) {
# Line 252 | Line 252 | void AnaFwkMod::SlaveBegin()
252    
253    ReqBranch(fPileupInfoName, fPileupInfo);
254    
255 <  hNPU = new TH1D("hNPU", "hNPU", 51, -0.5, 50.5);
255 >  hNPU = new TH1D("hNPU", "hNPU", 201, -0.5, 200.5);
256    AddOutput(hNPU);  
257    
258 <  hNPU50ns = new TH3D("hNPU50ns", "hNPU50ns", 51, -0.5, 50.5, 51, -0.5, 50.5, 51, -0.5, 50.5);
258 >  hNPU50ns = new TH3D("hNPU50ns", "hNPU50ns", 201, -0.5, 200.5, 201, -0.5, 200.5, 201, -0.5, 200.5);
259    AddOutput(hNPU50ns);  
260    
261   }

Diff Legend

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