Changeset 6069 for trunk/MagicSoft/Mars
- Timestamp:
- 01/28/05 10:09:32 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r6068 r6069 20 20 21 21 -*-*- END OF LINE -*-*- 22 2005/01/28 Thomas Bretz 23 24 * mjobs/MJCalibrateSignal.cc: 25 - fixed that extract1,2,3 haven't been deleted if loop failed. 26 - print tasklist also if loop failed. 27 28 29 22 30 2005/01/28 Markus Gaug 23 31 … … 25 33 - introduce a security check for the time fine adjustment in case, 26 34 it is too large. 35 27 36 28 37 … … 33 42 fraction of total). Moved MSrcPosCam in output from RunHeaders 34 43 to Events tree. 44 45 35 46 36 47 2005/01/27 Daniel Mazin and Markus Gaug -
trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
r6057 r6069 573 573 MFillH fill7(&evt7, "MArrivalTime", "FillTimes"); 574 574 MFillH fill8(&evt8, "MCalibrateData", "FillConv"); 575 576 MTaskEnv fillflorian("FinalFantasy"); 577 fillflorian.SetDefault(); 575 578 576 579 // The second rule is for the case reading raw-files! … … 686 689 tlist2.AddToList(&fill7); 687 690 691 tlist2.AddToList(&fillflorian); 692 688 693 // Setup List for Drive-tree 689 694 MPointingPosCalc pcalc; … … 711 716 712 717 // Execute first analysis 713 if (!evtloop.Eventloop(fMaxEvents)) 718 const Bool_t rc = evtloop.Eventloop(fMaxEvents); 719 720 // Print statistics 721 tlist.PrintStatistics(); 722 723 // make sure owned object are deleted 724 if (extractor1) 725 delete extractor1; 726 if (extractor2) 727 delete extractor2; 728 if (extractor3) 729 delete extractor3; 730 731 // return if job failed 732 if (!rc) 714 733 { 715 734 *fLog << err << GetDescriptor() << ": Failed." << endl; … … 717 736 } 718 737 719 tlist.PrintStatistics(); 720 738 // if everything went ok write and display result 721 739 DisplayResult(plist); 722 740 … … 724 742 return kFALSE; 725 743 726 if (extractor1) 727 delete extractor1; 728 if (extractor2) 729 delete extractor2; 730 if (extractor3) 731 delete extractor3; 732 744 // return if job went ok 733 745 *fLog << all << GetDescriptor() << ": Done." << endl; 734 746 *fLog << endl << endl;
Note:
See TracChangeset
for help on using the changeset viewer.