Changeset 8245 for trunk/MagicSoft/Mars/mjobs

Timestamp:

01/11/07 15:25:39 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibTest.cc (modified) (1 diff)
• MJCalibrateSignal.cc (modified) (1 diff)
• MJCalibration.cc (modified) (1 diff)
• MJPedestal.cc (modified) (2 diffs)
• MJStar.cc (modified) (1 diff)
• MJob.cc (modified) (2 diffs)
• MJob.h (modified) (3 diffs)
• MSequence.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -287 +287 @@
   if (fSequence.IsValid())
     {
-        if (fSequence.SetupCalRuns(iter, fPathData, IsUseRawData())<=0)
+        if (fSequence.SetupCalRuns(iter, 0, IsUseRawData())<=0)
             return kFALSE;
     }

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -246 +246 @@
     if (fSequence.IsValid())
     {
-        if (fSequence.SetupDatRuns(iter, fPathData, IsUseRawData())<=0)
+        if (fSequence.SetupDatRuns(iter, 0, IsUseRawData())<=0)
             return kFALSE;
     }

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1698 +1698 @@
 
     MDirIter iter;
-    if (fSequence.SetupCalRuns(iter, fPathData, IsUseRawData())<=0)
+    if (fSequence.SetupCalRuns(iter, 0, IsUseRawData())<=0)
         return kFALSE;
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -1003 +1003 @@
     fLog->Separator(GetDescriptor());
     *fLog << "Calculate MPedestalCam from " << type << "-runs ";
-    *fLog << fSequence.GetName() << endl;
+    *fLog << fSequence.GetFileName() << endl;
     *fLog << endl;
 
@@ -1023 +1023 @@
     {
         const Int_t n0 = IsUseData()
-            ? fSequence.SetupDatRuns(iter, fPathData, IsUseRawData())
-            : fSequence.SetupPedRuns(iter, fPathData, IsUseRawData());
+            ? fSequence.SetupDatRuns(iter, 0, IsUseRawData())
+            : fSequence.SetupPedRuns(iter, 0, IsUseRawData());
 
         if (n0<=0)

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -142 +142 @@
 
     MDirIter iter;
-    if (fSequence.SetupDatRuns(iter, MSequence::kCalibrated, fPathData)<=0)
+    if (fSequence.SetupDatRuns(iter, MSequence::kCalibrated)<=0)
         return kFALSE;
 

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -140 +140 @@
 }
 
-void MJob::SetPathData(const char *path)
-{
-    fPathData = path;
-    FixPath(fPathData);
-}
-
 const TEnv *MJob::GetEnv() const
 {
@@ -184 +178 @@
     if (!p.IsNull())
         SetPathIn(p);
-
-    p = GetEnv("PathData", "");
-    if (!p.IsNull())
-        SetPathData(p);
 
     SetMaxEvents(GetEnv("MaxEvents", fMaxEvents));

trunk/MagicSoft/Mars/mjobs/MJob.h

@@ -24 +24 @@
     TString   fPathOut;       // Directory to write output file to (eg. calib*.root)
     TString   fPathIn;        // Directory to read output from (eg. calib*.root)
-    TString   fPathData;      // Directory to read  data files from (2004*.root)
 
     Bool_t    fOverwrite;     // Allow overwriting output files
@@ -58 +57 @@
     void   SetPathOut(const char *path=".");
     void   SetPathIn(const char *path=".");
-    void   SetPathData(const char *path=".");
 
     void   SetOverwrite(Bool_t b=kTRUE) { fOverwrite=b; }
@@ -71 +69 @@
     TString GetPathOut() const  { return fPathOut; }
     TString GetPathIn() const   { return fPathIn; }
-    TString GetPathData() const { return fPathData; }
 
     // Others

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -26 +26 @@
     };
 private:
+    TString fFileName;
+    TString fDataPath;
+
     UInt_t fSequence;
 
@@ -63 +66 @@
     MSequence() : fSequence((UInt_t)-1), fLastRun((UInt_t)-1),
         fNumEvents((UInt_t)-1), fPeriod((UInt_t)-1) { }
-    MSequence(const char *fname);
+    MSequence(const char *fname, const char *path="");
     MSequence(const MSequence &s) : fSequence(s.fSequence), fStart(s.fStart),
         fLastRun(s.fLastRun), fNumEvents(s.fNumEvents), fPeriod(s.fPeriod),
@@ -114 +117 @@
     const TString GetStandardPath() const { return "/magic/data/"; }
 
+    const TString &GetFileName() const { return fFileName; }
+    const TString &GetDataPath() const { return fDataPath; }
+
     // Setter
     void SetNight(const char*night);