Changeset 8245 for trunk/MagicSoft

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• callisto.cc (modified) (9 diffs)
• callisto.rc (modified) (2 diffs)
• mjobs/MJCalibTest.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (2 diffs)
• mjobs/MJStar.cc (modified) (1 diff)
• mjobs/MJob.cc (modified) (2 diffs)
• mjobs/MJob.h (modified) (3 diffs)
• mjobs/MSequence.h (modified) (3 diffs)
• star.cc (modified) (2 diffs)
• star.rc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -68 +68 @@
      - use return value of MDataSet::AddFilesOn/Off for a sanity check
 
+   * mjobs/MJob.[h,cc]:
+     - removed obsolete fPathData and stuff
+
+   * callisto.cc, star.cc:
+     - removed obsolete calls to MJob::SetPathData
+
+   * callisto.rc, star.rc:
+     - removed obsolete examples for "PathData"-resource
+
+   * mjobs/MJCalibTest.cc, mjobs/MJCalibrateSignal.cc, 
+     mjobs/MJCalibration.cc, mjobs/MJPedestal.cc, mjobs/MJStar.cc:
+     - removed obsolete reference to fPathData
+
 
 

trunk/MagicSoft/Mars/NEWS

@@ -38 +38 @@
      treatment is not done for it anymore because it has never been used.
 
+   - callisto: Fixed a bug in the seuqence handling which caused the
+     light condition to be ignored
+
    - optim: fixed a problem with the optim-macros which was due to a bug
      in the new phrase parsing
@@ -51 +54 @@
      macros could run with less files found than expected from the
      sequence-files. No the execution is stopped in this case.
+
+   - ganymed: now stores the dataset in the output file with all information
+     contained (as sequence number, sequence path, data path) so that the
+     used dataset file can be recreated complete from the output
 
    - sponde: now also allows the uasge of random forest

trunk/MagicSoft/Mars/callisto.cc

@@ -283 +283 @@
     // Setup sequence and check its validity
     //
-    MSequence seq(kSequence);
+    MSequence seq(kSequence, kInpathD);
     if (kPrintSeq)
     {
@@ -372 +372 @@
         job1.SetDisplay(d);
         job1.SetOverwrite(kOverwrite);
-        job1.SetPathData(kInpathD);
         job1.SetDataType(kDataType);
         job1.SetUseHists(kMoon);
@@ -403 +402 @@
         job2.SetDisplay(d);;
         job2.SetOverwrite(kOverwrite);
-        job2.SetPathData(kInpathD);
         job2.SetDataType(kDataType);
         job2.SetUseHists(kMoon);
@@ -440 +438 @@
         job3.SetOverwrite(kOverwrite);
         job3.SetPathOut(kOutpathC);
-        job3.SetPathData(kInpathD);
         job3.SetDataType(kDataType);
         // job2.SetPathIn(kInpathC); // not yet needed
@@ -473 +470 @@
             job4.SetOverwrite(kOverwrite);
             job4.SetPathOut(kOutpathC);
-            job4.SetPathData(kInpathD);
             job4.SetDataType(kDataType);
 
@@ -508 +504 @@
         job1.SetNoDisplay();
         job1.SetOverwrite(kOverwrite);
-        job1.SetPathData(kInpathD);
         job1.SetPathIn(kInpathY);   // --> READ Extractor from calib-file
         job1.SetDataType(kDataType);
@@ -539 +534 @@
         job2.SetNoDisplay();
         job2.SetOverwrite(kOverwrite);
-        job2.SetPathData(kInpathD);
         job2.SetPathIn(kInpathY);
         job2.SetDataType(kDataType);
@@ -596 +590 @@
         job3.SetNoDisplay();
         job3.SetOverwrite(kOverwrite);
-        job3.SetPathData(kInpathD);
         job3.SetPathIn(kInpathY);
         job3.SetDataType(kDataType);
@@ -632 +625 @@
         job4.SetPathIn(kInpathY);
         job4.SetPathOut(kOutpathY);
-        job4.SetPathData(kInpathD);
         job4.SetDataType(kDataType);
         if (kDataType!=MJCalib::kIsUseMC)

trunk/MagicSoft/Mars/callisto.rc

@@ -42 +42 @@
 # -------------------------------------------------------------------------
 #MJCalibration.PathOut: calped
-
-# -------------------------------------------------------------------------
-# Use this to define where the program should search for the pedestal
-# and calibration files defined in the sequence. To use the local
-# directory use '.' If nothing is specified the default path in the
-# datacenter is used. (overwrites command line options)
-# -------------------------------------------------------------------------
-#MJPedestalC1.PathData:   /data/MAGIC/Period016/
-#MJPedestalC2.PathData:   /data/MAGIC/Period016/
-#MJCalibration.PathData:  /data/MAGIC/Period016/
 
 # -------------------------------------------------------------------------
@@ -288 +278 @@
 #MJPedestalY2.PathOut:        .
 #MJPedestalY3.PathOut:        .
-#MJPedestalY1.PathData:      /data/MAGIC/Period016/
-#MJPedestalY2.PathData:      /data/MAGIC/Period016/
-#MJPedestalY3.PathData:      /data/MAGIC/Period016/
-#MJCalibrateSignal.PathData: /data/MAGIC/Period016/
 #MJCalibrateSignal.PathIn:   .
 

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);

trunk/MagicSoft/Mars/star.cc

@@ -179 +179 @@
     // Setup sequence and check its validity
     //
-    MSequence seq(kSequence);
+    MSequence seq(kSequence, kInpath);
     if (kPrintSeq)
     {
@@ -244 +244 @@
         job.SetOverwrite(kOverwrite);
         job.SetPathOut(kOutpath);
-        job.SetPathData(kInpath);
         // job.SetPathIn(kInpath); // not yet needed
         if (kNoMuons)

trunk/MagicSoft/Mars/star.rc

@@ -29 +29 @@
 #MJStar.PathOut: .
 #MJStar.PathIn: .
-
-# -------------------------------------------------------------------------
-# Use this to define where the program should search for the pedestal
-# and calibration files defined in the sequence. To use the local
-# directory use '.' If nothing is specified the default path in the
-# datacenter is used. (overwrites command line options)
-# -------------------------------------------------------------------------
-#MJStar.PathData:   /data/MAGIC/Period016/
 
 # -------------------------------------------------------------------------