Changeset 4695

Timestamp:

08/20/04 16:15:37 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/JobsLinkDef.h (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (2 diffs)
• mjobs/MJExtractSignal.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (2 diffs)
• mjobs/MJPedestal.h (modified) (2 diffs)
• mjobs/MSequence.cc (modified) (2 diffs)
• mjobs/MSequence.h (modified) (2 diffs)
• mjobs/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
  2004/08/20: Thomas Bretz
 
+   * mjobs/MSequence.[h,cc]:
+     - added path-option to SetupRuns
+
+   * mjobs/MJCalibration.cc, mjobs/MJExtractSignal.cc, MJPedestal.cc:
+     - changed file "UPDATE" to "RECREATE"
+ 
    * macros/sql/filldotrbk.C:
      - removed obsolete output

trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h

@@ -9 +9 @@
 #pragma link C++ class MJPedestal+;
 #pragma link C++ class MJCalibration+;
+#pragma link C++ class MJCalibrateSignal+;
 #pragma link C++ class MJExtractSignal+;
 #pragma link C++ class MJExtractCalibTest+;

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1425 +1425 @@
     {
         read.DisableAutoScheme();
-        static_cast<MRead&>(read).AddFiles(fSequence ? iter : *fRuns);
+        read.AddFiles(fSequence ? iter : *fRuns);
         tlist.AddToList(&read);
     }
@@ -1702 +1702 @@
     *fLog << inf << "Writing to file: " << oname << endl;
 
-    TFile file(oname, "UPDATE");
+    TFile file(oname, "RECREATE");
 
     *fLog << inf << " - MStatusDisplay..." << flush;

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc

@@ -89 +89 @@
     *fLog << inf << "Writing to file: " << oname << endl;
 
-    TFile file(oname, "UPDATE");
+    TFile file(oname, "RECREATE");
 
     if (fDisplay && fDisplay->Write()<=0)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -451 +451 @@
     *fLog << inf << "Writing to file: " << oname << endl;
 
-    TFile file(oname, "UPDATE");
+    TFile file(oname, "RECREATE");
 
     if (fDisplay && fDisplay->Write()<=0)
@@ -560 +560 @@
         read.DisableAutoScheme();
         if (fRuns || fSequence)
-            static_cast<MRead&>(read).AddFiles(fSequence ? iter : *fRuns);
+            read.AddFiles(fSequence ? iter : *fRuns);
         tlist.AddToList(&read);
     }

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -42 +42 @@
     TEnv       *fEnv;           // Input setup-file
     MRunIter   *fRuns;          // Used pedestal runs
-    MSequence  *fSequence;      // Sequence
+    const MSequence  *fSequence;      // Sequence
 
     MExtractor *fExtractor;     // Signal extractor, used to find the nr. of used FADC slices
@@ -84 +84 @@
     void SetExtractor(MExtractor* ext) { fExtractor = ext; }
     void SetInput(MRunIter *iter) { fRuns = iter; }
-    void SetSequence(MSequence *seq, Bool_t usedata=kFALSE) { fSequence = seq; }
+    void SetSequence(const MSequence *seq, Bool_t usedata=kFALSE) { fSequence = seq; }
     void SetOutputPath(const char *path=".");
     void SetEnv(const char *env);

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -63 +63 @@
 }
 
-void MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr) const
+void MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path) const
 {
+    TString d(path);
+
+    // Setup path
+    if (!path)
+    {
+        d  = Form("/data/MAGIC/Period%03d/rootdata/", fPeriod);
+        d += fNight.GetStringFmt("%Y_%m_%d");
+    }
+
     for (int i=0; i<arr.GetSize(); i++)
     {
-        TString d, n;
-        d  = "/data/MAGIC/Period";
-        d += Form("%03d", fPeriod);
-        d += "/rootdata/";
-        d += fNight.GetStringFmt("%Y_%m_%d");
+        TString n;
+
+        // Create file name
         n =  fNight.GetStringFmt("%Y%m%d_");
-        n += Form("%05d", arr[i]);
-        n += "_*_E.root";
+        n += Form("%05d_*_E.root", arr[i]);
 
+        // Add Path/File to TIter
         iter.AddDirectory(d, n, 0);
     }
@@ -146 +153 @@
 }
 
-void MSequence::SetupPedRuns(MDirIter &iter) const
+void MSequence::SetupPedRuns(MDirIter &iter, const char *path) const
 {
-    SetupRuns(iter, fPedRuns);
+    SetupRuns(iter, fPedRuns, path);
 }
 
-void MSequence::SetupDatRuns(MDirIter &iter) const
+void MSequence::SetupDatRuns(MDirIter &iter, const char *path) const
 {
-    SetupRuns(iter, fDatRuns);
+    SetupRuns(iter, fDatRuns, path);
 }
 
-void MSequence::SetupAllRuns(MDirIter &iter) const
+void MSequence::SetupAllRuns(MDirIter &iter, const char *path) const
 {
-    SetupRuns(iter, fRuns);
+    SetupRuns(iter, fRuns, path);
 }
 
-void MSequence::SetupCalRuns(MDirIter &iter) const
+void MSequence::SetupCalRuns(MDirIter &iter, const char *path) const
 {
-    SetupRuns(iter, fCalRuns);
+    SetupRuns(iter, fCalRuns, path);
 }

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -36 +36 @@
 
     void Split(TString &runs, TArrayI &data) const;
-    void SetupRuns(MDirIter &iter, const TArrayI &arr) const;
+    void SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path) const;
 
 public:
@@ -43 +43 @@
     void Print(Option_t *o="") const;
 
-    void SetupPedRuns(MDirIter &iter) const;
-    void SetupDatRuns(MDirIter &iter) const;
-    void SetupAllRuns(MDirIter &iter) const;
-    void SetupCalRuns(MDirIter &iter) const;
+    void SetupPedRuns(MDirIter &iter, const char *path=0) const;
+    void SetupDatRuns(MDirIter &iter, const char *path=0) const;
+    void SetupAllRuns(MDirIter &iter, const char *path=0) const;
+    void SetupCalRuns(MDirIter &iter, const char *path=0) const;
 
     // Getter

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -28 +28 @@
            MJPedestal.cc \
            MJCalibration.cc \
+           MJCalibrateSignal.cc \
            MJExtractSignal.cc \
            MJExtractCalibTest.cc