ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitAna/TreeMod/src/AnaFwkMod.cc

Comparing UserCode/MitAna/TreeMod/src/AnaFwkMod.cc (file contents):
Revision 1.6 by loizides, Thu Mar 12 15:37:53 2009 UTC vs.
Revision 1.7 by loizides, Thu Mar 12 18:25:35 2009 UTC

#	Line 36 | Line 36 | void AnaFwkMod::BeginRun()
36		// depending on entry in RunInfo.
37
38		if (fReload) {
39	–
39		// reset to be (re-)loaded variables
40		fReload         = 0;
41		fAllHeadTree    = 0;
#	Line 90 | Line 89 | void AnaFwkMod::CopyAllEventHeaders()
89		return;
90		}
91		fAllHeadTree->GetEntry(fCurEnt++);
92	<	while(fAllEventHeader->Skimmed() && fCurEnt<nemax) {
92	>	while(fCurEnt<=nemax && fAllEventHeader->Skimmed()) {
93		EventHeader *eh = fAllHeaders.AddNew();
94		eh->SetRunNum(fAllEventHeader->RunNum());
95		eh->SetEvtNum(fAllEventHeader->EvtNum());
#	Line 118 | Line 117 | void AnaFwkMod::CopyAllEventHeaders()
117		if (fCurEnt<nemax) {
118		Int_t testEnt = fCurEnt;
119		fAllHeadTree->GetEntry(testEnt++);
120	<	while(fAllEventHeader->Skimmed() && testEnt<nemax)
120	>	while(testEnt<=nemax && fAllEventHeader->Skimmed())
121		fAllHeadTree->GetEntry(testEnt++);
122	<	if (testEnt==nemax) { // need to add remaining skimmed events
122	>	if (testEnt==nemax+1) { // need to add remaining skimmed events
123		fAllHeadTree->GetEntry(fCurEnt++);
124	<	while(fAllEventHeader->Skimmed() && fCurEnt<nemax) {
124	>	while(fCurEnt<=nemax) {
125		EventHeader *eh = fAllHeaders.AddNew();
126		eh->SetRunNum(fAllEventHeader->RunNum());
127		eh->SetEvtNum(fAllEventHeader->EvtNum());
#	Line 131 | Line 130 | void AnaFwkMod::CopyAllEventHeaders()
130		eh->SetSkimmed(fAllEventHeader->Skimmed());
131		fAllHeadTree->GetEntry(fCurEnt++);
132		}
133	<	if (fCurEnt != nemax) {
133	>	if (fCurEnt != nemax+1) {
134		SendError(kAbortEvent, "CopyAllEventHeaders",
135		"End of all events tree unexpectedly not reached (%d!=%d)", fCurEnt, nemax);
136		return;

Diff Legend

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