Changeset 14858 for trunk/Mars/mjobs/MSequence.cc

Timestamp:

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

Author:

tbretz

Message:

Updated the list of availavble file types.

File:

• trunk/Mars/mjobs/MSequence.cc (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;