Changeset 12796 for trunk


Ignore:
Timestamp:
01/31/12 11:25:30 (13 years ago)
Author:
tbretz
Message:
Added new data members and new file types; added new member functions to access the new data mambers; increased class version number
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/mjobs/MSequence.h

    r9441 r12796  
    2020
    2121    enum FileExt_t {
    22         kRaw   =BIT(0),
    23         kRoot  =BIT(1),
    24         kReport=BIT(2),
    25         kCer   =BIT(3),  // Corsika files
     22        kRaw    =BIT(0),
     23        kRoot   =BIT(1),
     24        kReport =BIT(2),
     25        kCer    =BIT(3),  // Corsika files
     26        kFits   =BIT(4),
     27        kDrs    =BIT(5),
    2628    };
    2729    enum RunType_t {
    28         kPed   =BIT(4),  // Don't use overlapping bits!
    29         kCal   =BIT(5),
    30         kDat   =BIT(6),
    31         kExcl  =BIT(7),
    32         kAll   =kPed|kDat|kCal,
    33         kImage =BIT(8),
    34         kCalib =BIT(9)
     30        kPed    =BIT(6),  // Don't use overlapping bits!
     31        kCal    =BIT(7),
     32        kDat    =BIT(8),
     33        kExcl   =BIT(9),
     34        kAll    =kPed|kDat|kCal,
     35        kImage  =BIT(10),
     36        kCalib  =BIT(11),
     37        kDrsRun =BIT(12),
     38        kDrsFile=BIT(13),
    3539    };
    3640
    37     enum { kRunType   = kPed|kCal|kDat|kImage|kCalib };
    38     enum { kFileType  = kRaw|kRoot|kReport|kCer };
     41    enum { kRunType   = kPed|kCal|kDat|kImage|kCalib|kDrsRun|kDrsFile };
     42    enum { kFileType  = kRaw|kRoot|kReport|kCer|kDrs|kFits };
    3943    enum { kFilePaths = kFileType|kImage|kCalib };
    4044
    … …  
    4347        kRawPed     = kRaw   |kPed,
    4448        kRawCal     = kRaw   |kCal,
     49        kFitsPed    = kFits  |kPed,
     50        kFitsCal    = kFits  |kCal,
     51        kFitsDat    = kFits  |kDat,
     52        kFitsDrs    = kFits  |kDrsFile,
     53        kRawDrs     = kDrs   |kDrsFile,
    4554        kRawAll     = kRaw   |kAll,
    4655        kRootDat    = kRoot  |kDat,
    … …  
    7281    MTime  fNight;             // Night (day of sunrise) of the sequence
    7382
     83    UInt_t fDrsSequence;       // Corresponding DRS sequence
     84
    7485    LightCondition_t fLightCondition;
    7586
    … …  
    91102    TArrayI fDatRuns;         // Numbers of data runs/files
    92103    TArrayI fDatRunsSub;      // Sub runs (files) of data runs
     104
     105    TArrayI fDrsRuns;         // Numbers of drs pedestal runs/files
     106    TArrayI fDrsRunsSub;      // Sub runs (files) of drs pedestal runs
     107
     108    TArrayI fDrsFiles;        // Runs for which DRS files exist
     109    TArrayI fDrsFilesSub;     // Sub runs (files) of DRS files runs
    93110
    94111    TArrayI fExclRuns;        // Numbers of excluded runs/files
    … …  
    124141
    125142    // General helper
    126     Bool_t  HasSubRuns() const { return fRunsSub.GetSize()!=0 || fDatRunsSub.GetSize()!=0 || fPedRunsSub.GetSize()!=0 || fCalRunsSub.GetSize()!=0 || fExclRunsSub.GetSize()!=0; }
     143    Bool_t  HasSubRuns() const { return fRunsSub.GetSize()!=0 || fDatRunsSub.GetSize()!=0 || fPedRunsSub.GetSize()!=0 || fCalRunsSub.GetSize()!=0 || fDrsRunsSub.GetSize()!=0 || fDrsFilesSub.GetSize()!=0 || fExclRunsSub.GetSize()!=0; }
    127144    Bool_t  IsContained(const TArrayI &arr, const TArrayI &sub, UInt_t num, UInt_t file) const;
    128145
    … …  
    154171        fCalRunsSub(s.fCalRunsSub), fPedRuns(s.fPedRuns),
    155172        fPedRunsSub(s.fPedRunsSub), fDatRuns(s.fDatRuns),
    156         fDatRunsSub(s.fDatRunsSub), fExclRuns(s.fExclRuns),
     173        fDatRunsSub(s.fDatRunsSub), fDrsRuns(s.fDrsRuns),
     174        fDrsRunsSub(s.fDrsRunsSub), fDrsFiles(s.fDrsFiles),
     175        fDrsFilesSub(s.fDrsFilesSub), fExclRuns(s.fExclRuns),
    157176        fExclRunsSub(s.fExclRunsSub), fMonteCarlo(s.fMonteCarlo) { }
    158177
    … …  
    168187    Bool_t WriteFile(const char *filename) const { return WriteFile(filename,""); } //*MENU *ARGS={filename=>fBaseName}
    169188    Bool_t SetDataPath(const char *path="");
     189    void   SetDrsSequence(UInt_t seq=0) { fDrsSequence = seq; }
    170190
    171191    // TObject
    … …  
    178198    Bool_t IsMonteCarlo() const { return fMonteCarlo; }
    179199    Bool_t IsExcluded(UInt_t run, UInt_t file) const { return IsContained(fExclRuns, fExclRunsSub, run, file); }
    180     Bool_t IsContained(UInt_t run, UInt_t file) const { return IsContained(fCalRuns, fCalRunsSub, run, file) || IsContained(fPedRuns, fPedRunsSub, run, file) || IsContained(fDatRuns, fDatRunsSub, run, file); }
     200    Bool_t IsContained(UInt_t run, UInt_t file) const { return IsContained(fCalRuns, fCalRunsSub, run, file) || IsContained(fPedRuns, fPedRunsSub, run, file) || IsContained(fDatRuns, fDatRunsSub, run, file) || IsContained(fDrsRuns, fDrsRunsSub, run, file); }
    181201
    182202    // Setter
    … …  
    200220    UInt_t GetLastRun() const  { return fLastRun; }
    201221    UInt_t GetPeriod() const   { return fPeriod; }
     222    UInt_t GetDrsSequence() const { return fDrsSequence; }
     223    UInt_t GetDrsFile() const;
    202224    Bool_t HasMoon() const { return fLightCondition==kMoon; }
    203225
    … …  
    238260    static TString InflateFilePath(const MTime &night, Bool_t mc=kFALSE);
    239261
    240     ClassDef(MSequence, 6) // Describes a sequences, reads and writes sequence files
     262    ClassDef(MSequence, 7) // Describes a sequences, reads and writes sequence files
    241263};
    242264
Note: See TracChangeset for help on using the changeset viewer.