Changeset 6069 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
01/28/05 10:09:32 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r6068 r6069  
    2020
    2121                                                 -*-*- 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
    2230 2005/01/28 Markus Gaug
    2331
     
    2533     - introduce a security check for the time fine adjustment in case,
    2634       it is too large.
     35
    2736
    2837
     
    3342       fraction of total). Moved MSrcPosCam in output from RunHeaders
    3443       to Events tree.
     44
     45
    3546
    3647 2005/01/27 Daniel Mazin and Markus Gaug
  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r6057 r6069  
    573573    MFillH fill7(&evt7, "MArrivalTime",           "FillTimes");
    574574    MFillH fill8(&evt8, "MCalibrateData",         "FillConv");
     575
     576    MTaskEnv fillflorian("FinalFantasy");
     577    fillflorian.SetDefault();
    575578
    576579    // The second rule is for the case reading raw-files!
     
    686689      tlist2.AddToList(&fill7);
    687690
     691    tlist2.AddToList(&fillflorian);
     692
    688693    // Setup List for Drive-tree
    689694    MPointingPosCalc pcalc;
     
    711716
    712717    // 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)
    714733    {
    715734        *fLog << err << GetDescriptor() << ": Failed." << endl;
     
    717736    }
    718737
    719     tlist.PrintStatistics();
    720 
     738    // if everything went ok write and display result
    721739    DisplayResult(plist);
    722740
     
    724742        return kFALSE;
    725743
    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
    733745    *fLog << all << GetDescriptor() << ": Done." << endl;
    734746    *fLog << endl << endl;
Note: See TracChangeset for help on using the changeset viewer.