Ignore:
Timestamp:
10/22/04 18:06:24 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mjobs
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r5308 r5310  
    17271727    tlist.PrintStatistics();
    17281728
     1729    if (!fCalibrationPINDiode.IsValid())
     1730        SetUsePINDiode(kFALSE);
     1731
    17291732    DisplayResult(plist);
    17301733
  • trunk/MagicSoft/Mars/mjobs/MSequence.cc

    r4920 r5310  
    134134}
    135135
    136 Int_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, Bool_t raw) const
     136Int_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw) const
    137137{
    138138    TString d(path);
     
    146146    }
    147147
     148    cout << d << endl;
     149
    148150    for (int i=0; i<arr.GetSize(); i++)
    149151    {
     152        // R. DeLosReyes and T. Bretz
     153        // Changes to read the DAQ numbering format. Changes takes place
     154        // between runs 35487 and 00035488 (2004_08_30)
     155        const char *fmt = arr[i]>35487 ? "%08d_%s_*_E" : "%05d_%s_*_E";
     156
    150157        TString n;
    151158
    152159        // Create file name
    153160        n =  fNight.GetStringFmt("%Y%m%d_");
    154         n += Form("%05d_*_E", arr[i]);
     161        n += Form(fmt, arr[i], id);
    155162        n += raw ? ".raw" : ".root";
    156163
     
    249256// Return the number of files added.
    250257//
    251 Int_t MSequence::SetupPedRuns(MDirIter &iter, const char *path, Bool_t raw) const
    252 {
    253     return SetupRuns(iter, fPedRuns, path, raw);
     258Int_t MSequence::SetupPedRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const
     259{
     260    return SetupRuns(iter, fPedRuns, path, id, raw);
    254261}
    255262
     
    262269// Return the number of files added.
    263270//
    264 Int_t MSequence::SetupDatRuns(MDirIter &iter, const char *path, Bool_t raw) const
    265 {
    266     return SetupRuns(iter, fDatRuns, path, raw);
     271Int_t MSequence::SetupDatRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const
     272{
     273    return SetupRuns(iter, fDatRuns, path, id, raw);
    267274}
    268275
     
    275282// Return the number of files added.
    276283//
    277 Int_t MSequence::SetupAllRuns(MDirIter &iter, const char *path, Bool_t raw) const
    278 {
    279     return SetupRuns(iter, fRuns, path, raw);
     284Int_t MSequence::SetupAllRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const
     285{
     286    return SetupRuns(iter, fRuns, path, id, raw);
    280287}
    281288
     
    288295// Return the number of files added.
    289296//
    290 Int_t MSequence::SetupCalRuns(MDirIter &iter, const char *path, Bool_t raw) const
    291 {
    292     return SetupRuns(iter, fCalRuns, path, raw);
    293 }
     297Int_t MSequence::SetupCalRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const
     298{
     299    return SetupRuns(iter, fCalRuns, path, id, raw);
     300}
  • trunk/MagicSoft/Mars/mjobs/MSequence.h

    r4802 r5310  
    3636
    3737    void Split(TString &runs, TArrayI &data) const;
    38     Int_t SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, Bool_t raw=kFALSE) const;
     38    Int_t SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw=kFALSE) const;
    3939
    4040public:
     
    5353    Bool_t IsValid() const { return fSequence!=(UInt_t)-1; }
    5454
    55     Int_t SetupPedRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const;
    56     Int_t SetupDatRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const;
    57     Int_t SetupAllRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const;
    58     Int_t SetupCalRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const;
     55    Int_t SetupPedRuns(MDirIter &iter, const char *path=0, char *id="P", Bool_t raw=kFALSE) const;
     56    Int_t SetupDatRuns(MDirIter &iter, const char *path=0, char *id="D", Bool_t raw=kFALSE) const;
     57    Int_t SetupAllRuns(MDirIter &iter, const char *path=0, char *id="?", Bool_t raw=kFALSE) const;
     58    Int_t SetupCalRuns(MDirIter &iter, const char *path=0, char *id="C", Bool_t raw=kFALSE) const;
    5959
    6060    Int_t GetNumAllRuns() const { return fRuns.GetSize(); }
Note: See TracChangeset for help on using the changeset viewer.