Changeset 14858 for trunk/Mars

Timestamp:

02/04/13 10:07:37 (12 years ago)

Author:

tbretz

Message:

Updated the list of availavble file types.

Location:

trunk/Mars/mjobs

Files:

• MSequence.cc (modified) (3 diffs)
• MSequence.h (modified) (3 diffs)

trunk/Mars/mjobs/MSequence.cc

@@ -472 +472 @@
     TString n;
 
-    if ((type&kRunType)==kDrsFile)
+    if (type&kDrsFile)
     {
         n += night.GetStringFmt("%Y%m%d_");
@@ -479 +479 @@
         return n;
     }
-    if ((type&kFileType)==kFits)
+    if (type&(kFits|kFact))
     {
         n += night.GetStringFmt("%Y%m%d_");
         n += MString::Format("%03d", run);
-        n += ".fits.?g?z?";
+
+        if (type==kFactCal)
+            n += "_C.root";
+        else if (type==kFactImg)
+            n += "_I.root";
+        else
+            n += ".fits.?g?z?";
         return n;
     }
@@ -698 +704 @@
 {
     if (fDrsRuns.GetSize()==0)
-        return fDrsFiles[0];
+        return fDrsFiles.GetSize()==0 ? 0 : fDrsFiles[0];
 
     UInt_t rc = 0;

trunk/Mars/mjobs/MSequence.h

@@ -26 +26 @@
         kFits   =BIT(4),
         kDrs    =BIT(5),
+        kFact   =BIT(6),
     };
     enum RunType_t {
-        kPed    =BIT(6),  // Don't use overlapping bits!
-        kCal    =BIT(7),
-        kDat    =BIT(8),
-        kExcl   =BIT(9),
+        kPed    =BIT(7),  // Don't use overlapping bits!
+        kCal    =BIT(8),
+        kDat    =BIT(9),
+        kExcl   =BIT(10),
         kAll    =kPed|kDat|kCal,
-        kImage  =BIT(10),
-        kCalib  =BIT(11),
-        kDrsRun =BIT(12),
-        kDrsFile=BIT(13),
+        kImage  =BIT(11),
+        kCalib  =BIT(12),
+        kDrsRun =BIT(13),
+        kDrsFile=BIT(14),
     };
 
     enum { kRunType   = kPed|kCal|kDat|kImage|kCalib|kDrsRun|kDrsFile };
-    enum { kFileType  = kRaw|kRoot|kReport|kCer|kDrs|kFits };
+    enum { kFileType  = kRaw|kRoot|kReport|kCer|kDrs|kFits|kFact };
     enum { kFilePaths = kFileType|kImage|kCalib };
 
@@ -51 +52 @@
         kFitsDat    = kFits  |kDat,
         kFitsDrs    = kFits  |kDrsFile,
+        kFitsDrsRuns= kFits  |kDrsRun,
+        kFactCal    = kFits  |kCalib,
+        kFactImg    = kFits  |kImage,
         kRawDrs     = kDrs   |kDrsFile,
         kRawAll     = kRaw   |kAll,
@@ -249 +253 @@
 
     // Static function for external access
-    static TString GetStandardPath(Bool_t mc) { return mc?"/magic/montecarlo/":"/magic/data/"; }
+    //static TString GetStandardPath(Bool_t mc) { return mc?"/magic/montecarlo/":"/data00/fact-construction/"; }
+    static TString GetStandardPath(Bool_t mc) { return mc?"/magic/montecarlo/":"/fact/"; }
     static Bool_t  InflateSeq(TString &seq, /*FIXME: TELNUM*/ Bool_t ismc=kFALSE);