Changeset 9609


Ignore:
Timestamp:
Jul 5, 2010, 5:33:46 PM (10 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9608 r9609  
    3131       number to be 1.
    3232
     33   * mjobs/MJSimulation.[h,cc]:
     34     - added run-number to ceres.root filename
     35
    3336
    3437
  • trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

    r9597 r9609  
    149149*/
    150150
    151 Bool_t MJSimulation::WriteResult(const MParList &plist, const MSequence &seq)
     151Bool_t MJSimulation::WriteResult(const MParList &plist, const MSequence &seq, Int_t num)
    152152{
    153153    if (fPathOut.IsNull())
     
    184184    }
    185185
    186     const TString name = seq.IsValid() ? Form("ceres%08d.root", seq.GetSequence()) : "ceres.root";
     186    const TString name =  Form("ceres%08d.root", num);
    187187    return WriteContainer(cont, name, "RECREATE");
    188188}
     
    315315    case kModeData:
    316316        header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTData);
    317          header.SetRunInfo(0, fRunNumber<0 ? 3 : fRunNumber);
     317        header.SetRunInfo(0, fRunNumber<0 ? 3 : fRunNumber);
    318318        break;
    319319
     
    931931    //-------------------------------------------
    932932
    933     if (!WriteResult(plist, seq))
     933    if (!WriteResult(plist, seq, header.GetRunNumber()))
    934934        return kFALSE;
    935935
  • trunk/MagicSoft/Mars/mjobs/MJSimulation.h

    r9597 r9609  
    2626    Int_t  fRunNumber;      // 8 digits run number to be used for the file names
    2727
    28     Bool_t WriteResult(const MParList &plist, const MSequence &seq);
     28    Bool_t WriteResult(const MParList &plist, const MSequence &seq, Int_t run);
    2929    Bool_t CheckEnvLocal();
    3030
Note: See TracChangeset for help on using the changeset viewer.