Changeset 8744
- Timestamp:
- 09/07/07 13:17:18 (17 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8743 r8744 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2007/09/07 Thomas Bretz 22 23 * mbase/MEvtLoop.cc: 24 - added a newline before the "Instantiated" message 25 26 * mbase/MLog.cc, mbase/MLogManip.h: 27 - added a green level inf2 and inf3 (4 and 5) 28 - shifted the blue dbg level to 6 29 30 * mbase/MParList.cc, mbase/MTaskList.cc, mfileio/MReadTree.cc, 31 mjobs/MDataSet.cc, mjobs/MSequence.cc, mraw/MRawRunHeader.cc: 32 - made use of the new inf-levels. This gives a shorter, thus 33 more readable, output at normal circumstances 34 35 * mjobs/MJSpectrum.cc: 36 - added a comment 37 38 * mpedestal/MExtractPedestal.cc, msignal/MExtractor.cc: 39 - improved output in case of non matching windows 40 41 20 42 21 43 2007/09/06 Daniela Dorner -
trunk/MagicSoft/Mars/mbase/MEvtLoop.cc
r8644 r8744 109 109 SetBit(kMustCleanup); 110 110 111 *fLog << inf << underline << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOT_RELEASE << endl;111 *fLog << inf << endl << underline << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOT_RELEASE << endl; 112 112 } 113 113 -
trunk/MagicSoft/Mars/mbase/MLog.cc
r8137 r8744 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.5 6 2006-10-19 21:00:23 tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.57 2007-09-07 12:17:13 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 292 292 case 1: sout << MLog::kRed; break; // err 293 293 case 2: sout << MLog::kYellow; break; // warn 294 case 3: sout << MLog::kGreen; break; // inf 294 case 3: 295 case 4: 296 case 5: sout << MLog::kGreen; break; // inf 295 297 default: sout << MLog::kBlue; break; // all others (dbg) 296 298 } -
trunk/MagicSoft/Mars/mbase/MLogManip.h
r8243 r8744 30 30 const _Debug warn = { 2 }; // use this for wrnings (yellow) 31 31 const _Debug inf = { 3 }; // use this for informations (green) 32 const _Debug dbg = { 4 }; // use this for debug messages (blue) 32 const _Debug inf2 = { 4 }; // use this for informations (green) 33 const _Debug inf3 = { 5 }; // use this for informations (green) 34 const _Debug dbg = { 6 }; // use this for debug messages (blue) 33 35 34 36 inline _Debug debug(int level) -
trunk/MagicSoft/Mars/mbase/MParList.cc
r8642 r8744 234 234 } 235 235 236 *fLog << inf << "Adding " << name << " to " << GetName() << "... " << flush;236 *fLog << inf3 << "Adding " << name << " to " << GetName() << "... " << flush; 237 237 238 238 cont->SetBit(kMustCleanup); 239 239 fContainer->Add(cont); 240 *fLog << " Done." << endl;240 *fLog << "done." << endl; 241 241 242 242 return kTRUE; … … 292 292 delete obj; 293 293 294 *fLog << inf << "MParContainer '" << cont->GetName() << "' found and replaced..." << endl;294 *fLog << inf2 << "MParContainer '" << cont->GetName() << "' found and replaced..." << endl; 295 295 296 296 return AddToList(cont); … … 564 564 // if object is not existing in the list try to create one 565 565 // 566 *fLog << inf << "Object '" << oname << "' ";566 *fLog << inf2 << "Object '" << oname << "' "; 567 567 if (oname!=cname) 568 568 *fLog << "[" << cname << "] "; -
trunk/MagicSoft/Mars/mbase/MTaskList.cc
r8642 r8744 252 252 const TString stream = type ? (TString)type : task->GetStreamId(); 253 253 254 *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush;254 *fLog << inf3 << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; 255 255 task->SetStreamId(stream); 256 256 task->SetBit(kMustCleanup); 257 257 fTasks->AddBefore((TObject*)where, task); 258 *fLog << " Done." << endl;258 *fLog << "done." << endl; 259 259 260 260 return kTRUE; … … 282 282 const TString stream = type ? (TString)type : task->GetStreamId(); 283 283 284 *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush;284 *fLog << inf3 << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; 285 285 task->SetStreamId(stream); 286 286 task->SetBit(kMustCleanup); 287 287 fTasks->AddAfter((TObject*)where, task); 288 *fLog << " Done." << endl;288 *fLog << "done." << endl; 289 289 290 290 return kTRUE; … … 312 312 const TString stream = type ? (TString)type : task->GetStreamId(); 313 313 314 *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush;314 *fLog << inf3 << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; 315 315 task->SetStreamId(stream); 316 316 task->SetBit(kMustCleanup); 317 317 fTasks->Add(task); 318 *fLog << " Done." << endl;318 *fLog << "done." << endl; 319 319 320 320 return kTRUE; … … 1104 1104 return kTRUE; 1105 1105 1106 *fLog << inf << "Replacing " << task->GetName() << " in " << GetName() << " for " << obj->GetStreamId() << "... " << flush;1106 *fLog << inf2 << "Replacing " << task->GetName() << " in " << GetName() << " for " << obj->GetStreamId() << "... " << flush; 1107 1107 task->SetStreamId(obj->GetStreamId()); 1108 1108 task->SetBit(kMustCleanup); 1109 1109 fTasks->AddAfter((TObject*)obj, task); 1110 *fLog << " Done." << endl;1110 *fLog << "done." << endl; 1111 1111 1112 1112 RemoveFromList(obj); -
trunk/MagicSoft/Mars/mfileio/MReadTree.cc
r8674 r8744 395 395 { 396 396 SetBit(kChainWasChanged); 397 if (numfiles>1 || gLog.GetDebugLevel()>4)398 *fLog << inf << GetDescriptor() << ": Added " << fname << " <" << numfiles << ">" << endl;397 if (numfiles>1) 398 *fLog << inf3 << GetDescriptor() << ": Added " << fname << " <" << numfiles << ">" << endl; 399 399 } 400 400 else -
trunk/MagicSoft/Mars/mjobs/MDataSet.cc
r8724 r8744 545 545 if (gLog.GetDebugLevel()>4) 546 546 { 547 gLog << dbg<< "Files which are searched:" << endl;547 gLog << inf << "Files which are searched:" << endl; 548 548 files.Print(); 549 549 } -
trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc
r8727 r8744 444 444 // Because it is assumed that the efficiency outside the production 445 445 // area is nearly zero no additional weight has to be applied to the 446 // events after cuts. 446 // events after cuts. For the events before cuts it is fair to use 447 // weights... maybe filling the residual impact with unweighted 448 // events would be better?!? (Not that the weighting might be 449 // less correct with low statistics, because it could pronounce 450 // a fluctuation) 447 451 const Double_t impact = rh->GetMaximum("MMcRunHeader.fImpactMax"); 448 452 const Double_t scale = impactmax/impact; 449 453 450 454 // Propagate the run header to MMcSpectrumWeight 451 455 if (!weight.Set(*head)) -
trunk/MagicSoft/Mars/mjobs/MSequence.cc
r8695 r8744 347 347 return 0; 348 348 349 *fLog << dbg<< "Files which are searched for this sequence:" << endl;349 *fLog << inf << "Files which are searched for this sequence:" << endl; 350 350 iter.Print(); 351 351 return 0; -
trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc
r8741 r8744 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.3 5 2007-09-05 19:36:36 tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.36 2007-09-07 12:17:16 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 355 355 *fLog << inf << "CheckWindow [" << fCheckWinFirst << "," << fCheckWinLast; 356 356 *fLog << "] out of range [0," << num-1 << "]... "; 357 *fLog << "reset upper edge ." << endl;357 *fLog << "reset upper edge to " << num-1 << "." << endl; 358 358 359 359 fCheckWinLast = num-1; … … 375 375 *fLog << inf << "ExtractWindow [" << fExtractWinFirst+offset << "," << fExtractWinLast+offset; 376 376 *fLog << "] out of range [0," << num-1 << "]... "; 377 *fLog << "reset upper edge ." << endl;377 *fLog << "reset upper edge to " << num-1 << "." << endl; 378 378 379 379 fExtractWinLast = num-offset-1; … … 383 383 if (fExtractWinFirst>fExtractWinLast) 384 384 { 385 *fLog << err << "Extract ionWindow first slice " << fExtractWinFirst+offset;385 *fLog << err << "ExtractWindow first slice " << fExtractWinFirst+offset; 386 386 *fLog << " greater than last slice " << fExtractWinLast+offset; 387 387 *fLog << "... reset to 0." << endl; … … 587 587 if (fExtractor) 588 588 { 589 *fLog << all << fExtractor->ClassName() << "... " << flush; 589 590 if (!fExtractor->ReInit(pList)) 590 591 return kFALSE; -
trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc
r8720 r8744 604 604 return; 605 605 606 *fLog << inf << "Assignment:" << hex << endl;606 *fLog << inf3 << "Assignment:" << hex << endl; 607 607 for (int i=0; i<GetNumPixel(); i++) 608 608 *fLog << setfill('0') << setw(3) << (*fPixAssignment)[i] << " "; -
trunk/MagicSoft/Mars/msignal/MExtractor.cc
r8642 r8744 237 237 if (fHiGainLast>=num) 238 238 { 239 *fLog << err << " ERROR - Last hi-gain slicemust not exceed " << num-1 << endl;239 *fLog << err << "MExtractor: ERROR - Last hi-gain slice " << (int)fHiGainLast << " must not exceed " << num-1 << endl; 240 240 return kFALSE; 241 241 } 242 242 if (fLoGainLast>=num) 243 243 { 244 *fLog << err << " ERROR - Last lo-gain slicemust not exceed " << num-1 << endl;244 *fLog << err << "MExtractor: ERROR - Last lo-gain slice " << (int)fLoGainLast << " must not exceed " << num-1 << endl; 245 245 return kFALSE; 246 246 }
Note:
See TracChangeset
for help on using the changeset viewer.