Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 8743) +++ trunk/MagicSoft/Mars/Changelog (revision 8744) @@ -18,4 +18,26 @@ -*-*- END OF LINE -*-*- + + 2007/09/07 Thomas Bretz + + * mbase/MEvtLoop.cc: + - added a newline before the "Instantiated" message + + * mbase/MLog.cc, mbase/MLogManip.h: + - added a green level inf2 and inf3 (4 and 5) + - shifted the blue dbg level to 6 + + * mbase/MParList.cc, mbase/MTaskList.cc, mfileio/MReadTree.cc, + mjobs/MDataSet.cc, mjobs/MSequence.cc, mraw/MRawRunHeader.cc: + - made use of the new inf-levels. This gives a shorter, thus + more readable, output at normal circumstances + + * mjobs/MJSpectrum.cc: + - added a comment + + * mpedestal/MExtractPedestal.cc, msignal/MExtractor.cc: + - improved output in case of non matching windows + + 2007/09/06 Daniela Dorner Index: trunk/MagicSoft/Mars/mbase/MEvtLoop.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MEvtLoop.cc (revision 8743) +++ trunk/MagicSoft/Mars/mbase/MEvtLoop.cc (revision 8744) @@ -109,5 +109,5 @@ SetBit(kMustCleanup); - *fLog << inf << underline << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOT_RELEASE << endl; + *fLog << inf << endl << underline << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOT_RELEASE << endl; } Index: trunk/MagicSoft/Mars/mbase/MLog.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MLog.cc (revision 8743) +++ trunk/MagicSoft/Mars/mbase/MLog.cc (revision 8744) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.56 2006-10-19 21:00:23 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.57 2007-09-07 12:17:13 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -292,5 +292,7 @@ case 1: sout << MLog::kRed; break; // err case 2: sout << MLog::kYellow; break; // warn - case 3: sout << MLog::kGreen; break; // inf + case 3: + case 4: + case 5: sout << MLog::kGreen; break; // inf default: sout << MLog::kBlue; break; // all others (dbg) } Index: trunk/MagicSoft/Mars/mbase/MLogManip.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MLogManip.h (revision 8743) +++ trunk/MagicSoft/Mars/mbase/MLogManip.h (revision 8744) @@ -30,5 +30,7 @@ const _Debug warn = { 2 }; // use this for wrnings (yellow) const _Debug inf = { 3 }; // use this for informations (green) -const _Debug dbg = { 4 }; // use this for debug messages (blue) +const _Debug inf2 = { 4 }; // use this for informations (green) +const _Debug inf3 = { 5 }; // use this for informations (green) +const _Debug dbg = { 6 }; // use this for debug messages (blue) inline _Debug debug(int level) Index: trunk/MagicSoft/Mars/mbase/MParList.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MParList.cc (revision 8743) +++ trunk/MagicSoft/Mars/mbase/MParList.cc (revision 8744) @@ -234,9 +234,9 @@ } - *fLog << inf << "Adding " << name << " to " << GetName() << "... " << flush; + *fLog << inf3 << "Adding " << name << " to " << GetName() << "... " << flush; cont->SetBit(kMustCleanup); fContainer->Add(cont); - *fLog << "Done." << endl; + *fLog << "done." << endl; return kTRUE; @@ -292,5 +292,5 @@ delete obj; - *fLog << inf << "MParContainer '" << cont->GetName() << "' found and replaced..." << endl; + *fLog << inf2 << "MParContainer '" << cont->GetName() << "' found and replaced..." << endl; return AddToList(cont); @@ -564,5 +564,5 @@ // if object is not existing in the list try to create one // - *fLog << inf << "Object '" << oname << "' "; + *fLog << inf2 << "Object '" << oname << "' "; if (oname!=cname) *fLog << "[" << cname << "] "; Index: trunk/MagicSoft/Mars/mbase/MTaskList.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MTaskList.cc (revision 8743) +++ trunk/MagicSoft/Mars/mbase/MTaskList.cc (revision 8744) @@ -252,9 +252,9 @@ const TString stream = type ? (TString)type : task->GetStreamId(); - *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; + *fLog << inf3 << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; task->SetStreamId(stream); task->SetBit(kMustCleanup); fTasks->AddBefore((TObject*)where, task); - *fLog << "Done." << endl; + *fLog << "done." << endl; return kTRUE; @@ -282,9 +282,9 @@ const TString stream = type ? (TString)type : task->GetStreamId(); - *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; + *fLog << inf3 << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; task->SetStreamId(stream); task->SetBit(kMustCleanup); fTasks->AddAfter((TObject*)where, task); - *fLog << "Done." << endl; + *fLog << "done." << endl; return kTRUE; @@ -312,9 +312,9 @@ const TString stream = type ? (TString)type : task->GetStreamId(); - *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; + *fLog << inf3 << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; task->SetStreamId(stream); task->SetBit(kMustCleanup); fTasks->Add(task); - *fLog << "Done." << endl; + *fLog << "done." << endl; return kTRUE; @@ -1104,9 +1104,9 @@ return kTRUE; - *fLog << inf << "Replacing " << task->GetName() << " in " << GetName() << " for " << obj->GetStreamId() << "... " << flush; + *fLog << inf2 << "Replacing " << task->GetName() << " in " << GetName() << " for " << obj->GetStreamId() << "... " << flush; task->SetStreamId(obj->GetStreamId()); task->SetBit(kMustCleanup); fTasks->AddAfter((TObject*)obj, task); - *fLog << "Done." << endl; + *fLog << "done." << endl; RemoveFromList(obj); Index: trunk/MagicSoft/Mars/mfileio/MReadTree.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MReadTree.cc (revision 8743) +++ trunk/MagicSoft/Mars/mfileio/MReadTree.cc (revision 8744) @@ -395,6 +395,6 @@ { SetBit(kChainWasChanged); - if (numfiles>1 || gLog.GetDebugLevel()>4) - *fLog << inf << GetDescriptor() << ": Added " << fname << " <" << numfiles << ">" << endl; + if (numfiles>1) + *fLog << inf3 << GetDescriptor() << ": Added " << fname << " <" << numfiles << ">" << endl; } else Index: trunk/MagicSoft/Mars/mjobs/MDataSet.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MDataSet.cc (revision 8743) +++ trunk/MagicSoft/Mars/mjobs/MDataSet.cc (revision 8744) @@ -545,5 +545,5 @@ if (gLog.GetDebugLevel()>4) { - gLog << dbg << "Files which are searched:" << endl; + gLog << inf << "Files which are searched:" << endl; files.Print(); } Index: trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc (revision 8743) +++ trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc (revision 8744) @@ -444,8 +444,12 @@ // Because it is assumed that the efficiency outside the production // area is nearly zero no additional weight has to be applied to the - // events after cuts. + // events after cuts. For the events before cuts it is fair to use + // weights... maybe filling the residual impact with unweighted + // events would be better?!? (Not that the weighting might be + // less correct with low statistics, because it could pronounce + // a fluctuation) const Double_t impact = rh->GetMaximum("MMcRunHeader.fImpactMax"); const Double_t scale = impactmax/impact; - + // Propagate the run header to MMcSpectrumWeight if (!weight.Set(*head)) Index: trunk/MagicSoft/Mars/mjobs/MSequence.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MSequence.cc (revision 8743) +++ trunk/MagicSoft/Mars/mjobs/MSequence.cc (revision 8744) @@ -347,5 +347,5 @@ return 0; - *fLog << dbg << "Files which are searched for this sequence:" << endl; + *fLog << inf << "Files which are searched for this sequence:" << endl; iter.Print(); return 0; Index: trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc (revision 8743) +++ trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc (revision 8744) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.35 2007-09-05 19:36:36 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.36 2007-09-07 12:17:16 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -355,5 +355,5 @@ *fLog << inf << "CheckWindow [" << fCheckWinFirst << "," << fCheckWinLast; *fLog << "] out of range [0," << num-1 << "]... "; - *fLog << "reset upper edge." << endl; + *fLog << "reset upper edge to " << num-1 << "." << endl; fCheckWinLast = num-1; @@ -375,5 +375,5 @@ *fLog << inf << "ExtractWindow [" << fExtractWinFirst+offset << "," << fExtractWinLast+offset; *fLog << "] out of range [0," << num-1 << "]... "; - *fLog << "reset upper edge." << endl; + *fLog << "reset upper edge to " << num-1 << "." << endl; fExtractWinLast = num-offset-1; @@ -383,5 +383,5 @@ if (fExtractWinFirst>fExtractWinLast) { - *fLog << err << "ExtractionWindow first slice " << fExtractWinFirst+offset; + *fLog << err << "ExtractWindow first slice " << fExtractWinFirst+offset; *fLog << " greater than last slice " << fExtractWinLast+offset; *fLog << "... reset to 0." << endl; @@ -587,4 +587,5 @@ if (fExtractor) { + *fLog << all << fExtractor->ClassName() << "... " << flush; if (!fExtractor->ReInit(pList)) return kFALSE; Index: trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc (revision 8743) +++ trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc (revision 8744) @@ -604,5 +604,5 @@ return; - *fLog << inf << "Assignment:" << hex << endl; + *fLog << inf3 << "Assignment:" << hex << endl; for (int i=0; i=num) { - *fLog << err << "ERROR - Last hi-gain slice must not exceed " << num-1 << endl; + *fLog << err << "MExtractor: ERROR - Last hi-gain slice " << (int)fHiGainLast << " must not exceed " << num-1 << endl; return kFALSE; } if (fLoGainLast>=num) { - *fLog << err << "ERROR - Last lo-gain slice must not exceed " << num-1 << endl; + *fLog << err << "MExtractor: ERROR - Last lo-gain slice " << (int)fLoGainLast << " must not exceed " << num-1 << endl; return kFALSE; }