Changeset 8244 for trunk/MagicSoft/Mars/mjobs/MSequence.cc

Timestamp:

01/11/07 14:56:24 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MSequence.cc (modified) (16 diffs)

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -130 +130 @@
 #include "MLogManip.h"
 
+#include "MEnv.h"
 #include "MJob.h"
 #include "MAstro.h"
@@ -202 +203 @@
 {
     TString d(path);
+    if (d.IsNull())
+        d = fDataPath;
 
     const Bool_t def = d.IsNull();
@@ -207 +210 @@
     // For this particular case we assume that the files are added one by
     // one without wildcards.
-    const Int_t n0  = iter.GetNumEntries();
+    const Int_t n0 = iter.GetNumEntries();
 
     // Setup path
@@ -291 +294 @@
         }
 
+        // Check existance and accessibility of file
+        MDirIter file(d, n, 0);
+        TString name = file();
+        gSystem->ExpandPathName(name);
+        if (gSystem->AccessPathName(name, kFileExists))
+        {
+            *fLog << err;
+            *fLog << "ERROR - File " << d << n << " not accessible!" << endl;
+            return 0;
+        }
+        if (!file().IsNull())
+        {
+            *fLog << err;
+            *fLog << "ERROR - Searching for file " << d << n << " gave more than one result!" << endl;
+            return 0;
+        }
+
         // Add Path/File to TIter
         iter.AddDirectory(d, n, 0);
@@ -358 +378 @@
 MSequence::LightCondition_t MSequence::ReadLightCondition(TEnv &env) const
 {
-    TString str = env.GetValue("LightCondition", "n/a");
+    TString str = env.GetValue("LightConditions", "n/a");
     if (!str.CompareTo("n/a", TString::kIgnoreCase))
         return kNA;
-    if (!str.CompareTo("NoMoon", TString::kIgnoreCase))
+    if (!str.CompareTo("No_Moon", TString::kIgnoreCase))
         return kNoMoon;
     if (!str.CompareTo("Twilight", TString::kIgnoreCase))
@@ -370 +390 @@
         return kDay;
 
-    gLog << warn << "MSequence: LightCondition-tag not n/a, nomoon, twilight, moon or day." << endl;
+    gLog << warn;
+    gLog << "WARNING - in " << fFileName << ":" << endl;
+    gLog << "          LightCondition-tag is '" << str << "' but must be n/a, no_moon, twilight, moon or day." << endl;
     return kNA;
 }
@@ -378 +400 @@
 // Read the file fname as setup file for the sequence.
 //
-MSequence::MSequence(const char *fname)
+MSequence::MSequence(const char *fname, const char *path)
 {
     fName  = fname;
-
-    const char *expname = gSystem->ExpandPathName(fname);
-
-    fTitle = Form("Sequence contained in file %s", expname);
-
-    const Bool_t access = !gSystem->AccessPathName(expname, kFileExists);
-    if (!access)
-        gLog << err << "ERROR - Dataset file " << expname << " not accessible!" << endl;
-
-    TEnv env(expname);
-    delete [] expname;
-
-    TString str;
-
-    fSequence  = env.GetValue("Sequence",  -1);
+    fTitle = path;
+
+    fFileName = fname;
+    fDataPath = path;
+
+    gSystem->ExpandPathName(fName);
+    gSystem->ExpandPathName(fTitle);
+
+    const Bool_t rc1 = gSystem->AccessPathName(fName, kFileExists);
+    const Bool_t rc2 = gSystem->AccessPathName(fTitle, kFileExists);
+
+    if (rc1)
+        gLog << err << "ERROR - Sequence file '" << fName << "' doesn't exist." << endl;
+    if (rc2)
+        gLog << err << "ERROR - Directory '" << fTitle << "' doesn't exist." << endl;
+
+    MEnv env(fName);
+
+    fSequence  = env.GetValue("Sequence", -1);
+    if (rc1 || rc2)
+        fSequence = (UInt_t)-1;
+
     fLastRun   = env.GetValue("LastRun",   -1);
     fNumEvents = env.GetValue("NumEvents", -1);
@@ -402 +431 @@
     fLightCondition = ReadLightCondition(env);
 
+    TString str;
     str = env.GetValue("Start", "");
     fStart.SetSqlDateTime(str);
@@ -426 +456 @@
     GetFileNames(env, fPedRuns);
     GetFileNames(env, fDatRuns);
+
+    // Dummies:
+    env.GetValue("ZdMin", 0);
+    env.GetValue("ZdMax", 0);
+    env.GetValue("L1TriggerTable", 0);
+    env.GetValue("L2TriggerTable", 0);
+
+    if (env.GetNumUntouched()>0)
+    {
+        gLog << warn << "WARNING - At least one resource in the dataset-file has not been touched!" << endl;
+        env.PrintUntouched();
+    }
 }
 
@@ -437 +479 @@
     if (!IsValid())
     {
-        gLog << "Sequence: " << fName << " <invalid>" << endl;
+        gLog << "Sequence: " << fFileName << " <invalid>" << endl;
         return;
     }
@@ -475 +517 @@
         gLog << " " << fDatRuns[i];
     gLog << endl;
+
+    if (!fDataPath.IsNull())
+        gLog << endl << "DataPath: " << fDataPath << endl;
 }
 
@@ -480 +525 @@
 //
 // Add all ped runs from the sequence to MDirIter.
-// If path==0 the standard path of the data-center is assumed.
+// If path==0 fDataPath is used instead. If it is also empty
+// the standard path of the data-center is assumed.
 // If you have the runs locally use path="."
 // Using raw=kTRUE you get correspodning raw-files setup.
 // Return the number of files added.
+//
 UInt_t MSequence::SetupPedRuns(MDirIter &iter, const char *path, Bool_t raw) const
 {
@@ -492 +539 @@
 //
 // Add all data runs from the sequence to MDirIter.
-// If path==0 the standard path of the data-center is assumed.
+// If path==0 fDataPath is used instead. If it is also empty
+// the standard path of the data-center is assumed.
 // If you have the runs locally use path="."
 // Using raw=kTRUE you get correspodning raw-files setup.
@@ -505 +553 @@
 //
 // Add all runs from the sequence to MDirIter.
-// If path==0 the standard path of the data-center is assumed.
+// If path==0 fDataPath is used instead. If it is also empty
+// the standard path of the data-center is assumed.
 // If you have the runs locally use path="."
 // Using raw=kTRUE you get correspodning raw-files setup.
@@ -518 +567 @@
 //
 // Add all calibration runs from the sequence to MDirIter.
-// If path==0 the standard path of the data-center is assumed.
+// If path==0 fDataPath is used instead. If it is also empty
+// the standard path of the data-center is assumed.
 // If you have the runs locally use path="."
 // Using raw=kTRUE you get correspodning raw-files setup.
@@ -531 +581 @@
 //
 // Add all data runs from the sequence to MDirIter.
-// If path==0 the standard path of the data-center is assumed.
+// If path==0 fDataPath is used instead. If it is also empty
+// the standard path of the data-center is assumed.
 // If you have the runs locally use path="."
 // Using raw=kTRUE you get correspodning raw-files setup.