Changeset 7380 for trunk/MagicSoft

Timestamp:

10/01/05 19:37:29 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• ganymed.cc (modified) (3 diffs)
• mjobs/MDataSet.cc (modified) (8 diffs)
• mjobs/MDataSet.h (modified) (3 diffs)
• mjobs/MSequence.cc (modified) (3 diffs)
• mjobs/MSequence.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/10/01 Thomas Bretz
+
+   * mjobs/MDataSet.[h,cc]:
+     - implemented two new options for constructor allowing to
+       change the default path to image data and sequence files
+     - fixed some typos
+
+   * mjobs/MSequence.[h,cc]:
+     - implemented new light condition "day" for completeness
+
+   * ganymed.cc:
+     - implemented twonew options --ind and --ins
+
+
 
  2005/10/01

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
  *** Version  <cvs>
+
+   - ganymed: Implemented two new options which allow
+     to overwrite the default path to search for the sequence files
+       --ins=/magic/sequences
+     and where to search for the image data
+       --ind=/magic/data/star
 
 

trunk/MagicSoft/Mars/ganymed.cc

@@ -63 +63 @@
     gLog << "   --n=[n]                   Analysis number" << endl;
     gLog << "   --out=path                Path to write the all output to [def=local path]" << endl;
+    gLog << "   --ind=path                Path to data/star files [default=datacenter path]" << endl;
+    gLog << "   --ins=path                Path to sequence files [default=datacenter path]" << endl;
     gLog << "   --outf=filename           Filename for output file (eg. status display)" << endl;
     gLog << "   --sum[=filename]          Enable writing of summary file (events after cut0)" << endl;
@@ -127 +129 @@
     const TString kOutpath       = arg.GetStringAndRemove("--out=",  ".");
     const TString kOutfile       = arg.GetStringAndRemove("--outf=",  "");
+    const TString kPathDataFiles = arg.GetStringAndRemove("--ind=",  "");
+    const TString kPathSequences = arg.GetStringAndRemove("--ins=",  "");
     const Bool_t  kWriteSummary  = arg.HasOnlyAndRemove("--sum");
     const TString kNameSummary   = arg.GetStringAndRemove("--sum=");
@@ -180 +184 @@
     // Setup sequence and check its validity
     //
-    MDataSet seq(kSequences);
+    MDataSet seq(kSequences, kPathSequences, kPathDataFiles);
     if (kNumAnalysis>=0)
         seq.SetNumAnalysis(kNumAnalysis);

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -96 +96 @@
 using namespace std;
 
+const TString MDataSet::fgCatalog       = "/magic/datacenter/setup/magic_favorites.edb";
+const TString MDataSet::fgPathDataFiles = "/magic/data/star";
+const TString MDataSet::fgPathSequences = "/magic/sequences";
+
 // --------------------------------------------------------------------------
 //
@@ -151 +155 @@
 // The entries are sorted by filename.
 //
-void MDataSet::ResolveSequences(TEnv &env, const TArrayI &num, TList &list) const
+void MDataSet::ResolveSequences(TEnv &env, const TArrayI &num, TList &list, const TString &sequences, const TString &data) const
 {
     for (int i=0; i<num.GetSize(); i++)
@@ -158 +162 @@
         TString dir  = env.GetValue(Form("Sequence%08d.Dir",  num[i]), "");
 
+        // Set default sequence file and dir name
+        if (name.IsNull())
+            name = Form("%s%04d/sequence%08d.txt", sequences.Data(), num[i]/10000, num[i]);
+        if (dir.IsNull())
+            dir = Form("%s%04d/%08d", data.Data(), num[i]/10000, num[i]);
+
         gSystem->ExpandPathName(name);
         gSystem->ExpandPathName(dir);
-
-        // Set default sequence file and dir name
-        if (name.IsNull())
-            name = Form("/magic/sequences/%04d/sequence%08d.txt", num[i]/10000, num[i]);
-        if (dir.IsNull())
-            dir = Form("/magic/data/star/%04d/%08d", num[i]/10000, num[i]);
 
         if (gSystem->AccessPathName(name, kFileExists))
@@ -185 +189 @@
 // Read the file fname as setup file for the sequence.
 //
-MDataSet::MDataSet(const char *fname)
+MDataSet::MDataSet(const char *fname, TString sequences, TString data)
 {
     fName  = fname;
@@ -191 +195 @@
     const char *expname = gSystem->ExpandPathName(fname);
 
-    fTitle = Form("Sequences contained in file %s", expname);
+    fTitle = Form("Dataset 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;
 
+    fNumAnalysis = env.GetValue("AnalysisNumber",  -1);
+
     TString str;
-
-    fNumAnalysis = env.GetValue("AnalysisNumber",  -1);
-
-    str = env.GetValue("SequencesOn", "");
+    str = env.GetValue("SequencesOn",  "");
     Split(str, fNumSequencesOn);
     str = env.GetValue("SequencesOff", "");
     Split(str, fNumSequencesOff);
 
-    ResolveSequences(env, fNumSequencesOn,  fSequencesOn);
-    ResolveSequences(env, fNumSequencesOff, fSequencesOff);
-
+    SetupDefaultPath(sequences, fgPathSequences);
+    SetupDefaultPath(data,      fgPathDataFiles);
+
+    ResolveSequences(env, fNumSequencesOn,  fSequencesOn,  sequences, data);
+    ResolveSequences(env, fNumSequencesOff, fSequencesOff, sequences, data);
 
     fNameSource   = env.GetValue("SourceName", "");
-    fCatalog      = env.GetValue("Catalog",    "~/Software/data/magic_favorites.edb");
+    fCatalog      = env.GetValue("Catalog",    fgCatalog);
     fIsWobbleMode = env.GetValue("WobbleMode", kFALSE);
-
-    //Print();
-    /*
-     GetFileNames(env, fSequencesOn);
-     GetFileNames(env, fSequencesOff);
-     */
+    fComment      = env.GetValue("Comment",    "");
 }
 
@@ -226 +230 @@
 void MDataSet::PrintFile(const TObject &obj)
 {
-    const Bool_t access = !gSystem->AccessPathName(obj.GetName(), kFileExists) && !gSystem->AccessPathName(obj.GetTitle(), kFileExists) ? '+' : '-';
-    gLog << " " << (access?"+":"-") << " " << obj.GetName() << " <" << obj.GetTitle() << ">" << endl;
+    const Char_t access =
+        !gSystem->AccessPathName(obj.GetName(), kFileExists) &&
+        !gSystem->AccessPathName(obj.GetTitle(), kFileExists) ? '+' : '-';
+
+    gLog << " " << access << " " << obj.GetName() << " <" << obj.GetTitle() << ">" << endl;
 }
 
@@ -242 +249 @@
         return;
     }
-    gLog << "Analysis Number: " << fNumAnalysis << endl;
-    gLog << "Sequences On:   ";
+    gLog << "AnalysisNumber: " << fNumAnalysis << endl << endl;
+    gLog << "SequencesOn:   ";
     for (int i=0; i<fNumSequencesOn.GetSize(); i++)
         gLog << " " << fNumSequencesOn[i];
     gLog << endl;
-    gLog << "Sequences Off:  ";
+    gLog << "SequencesOff:  ";
     for (int i=0; i<fNumSequencesOff.GetSize(); i++)
         gLog << " " << fNumSequencesOff[i];
-    gLog << endl;
+    gLog << endl << endl;
 
     gLog << "SourceName: " << fNameSource << endl;
-    gLog << "Catalog:    " << fCatalog << endl;
-
-    gLog << "WobbleMode: " << (fIsWobbleMode?"On":"Off") << endl;
-
-    if (!TString(o).Contains("files", TString::kIgnoreCase))
+    gLog << "Catalog: " << fCatalog << endl;
+
+    gLog << "WobbleMode: " << (fIsWobbleMode?"On":"Off") << endl << endl;
+
+    gLog << "Comment: " << fComment << endl;
+
+    if (TString(o).Contains("files", TString::kIgnoreCase))
+    {
+        TObject *obj=0;
+
+        gLog << endl;
+        gLog << "On-Data Files:" << endl;
+        TIter NextOn(&fSequencesOn);
+        while ((obj=NextOn()))
+            PrintFile(*obj);
+
+        gLog << endl;
+        gLog << "Off-Data Files:" << endl;
+        TIter NextOff(&fSequencesOff);
+        while ((obj=NextOff()))
+            PrintFile(*obj);
+
         return;
-
-    TObject *obj=0;
-
-    gLog << endl;
-    gLog << "On-Data Files:" << endl;
-    TIter NextOn(&fSequencesOn);
-    while ((obj=NextOn()))
-        PrintFile(*obj);
-
-    gLog << endl;
-    gLog << "Off-Data Files:" << endl;
-    TIter NextOff(&fSequencesOff);
-    while ((obj=NextOff()))
-        PrintFile(*obj);
+    }
 }
 
@@ -481 +492 @@
     return kTRUE;
 }
+
+// --------------------------------------------------------------------------
+//
+// Calls ReplaceAll(old, news) for all Dir-entries
+//
+void MDataSet::ReplaceDir(TList &list, const TString &old, const TString &news) const
+{
+    TIter Next(&list);
+    TNamed *name = 0;
+    while ((name=(TNamed*)Next()))
+    {
+        TString dir = name->GetTitle();
+        dir.ReplaceAll(old, news);
+        name->SetTitle(dir);
+    }
+}
+
+// --------------------------------------------------------------------------
+//
+// Calls ReplaceAll(old, news) for all File-entries
+//
+void MDataSet::ReplaceFile(TList &list, const TString &old, const TString &news) const
+{
+    TIter Next(&list);
+    TNamed *name = 0;
+    while ((name=(TNamed*)Next()))
+    {
+        TString file = name->GetName();
+        file.ReplaceAll(old, news);
+        name->SetName(file);
+    }
+}

trunk/MagicSoft/Mars/mjobs/MDataSet.h

@@ -19 +19 @@
 {
 private:
+    static const TString fgCatalog;       //! Default Catalog path
+    static const TString fgPathDataFiles; //! Default path to data files
+    static const TString fgPathSequences; //! Default path to sequences
+
     UInt_t  fNumAnalysis;     // Analysis number (artificial)
 
@@ -30 +34 @@
     TString fCatalog;         // edb catalog (magic_favourites.edb)
 
+    TString fComment;         // Comment from DS file
+
     Bool_t  fIsWobbleMode;    // Wobble Mode for this dataset?
 
     void Split(TString &runs, TArrayI &data) const;
-    void ResolveSequences(TEnv &env, const TArrayI &num, TList &list) const;
+    void ResolveSequences(TEnv &env, const TArrayI &num, TList &list, const TString &sequences, const TString &data) const;
     static void PrintFile(const TObject &obj);
+
+    void ReplaceDir(TList &list, const TString &old, const TString &news) const;
+    void ReplaceFile(TList &list, const TString &old, const TString &news) const;
+
+    void SetupDefaultPath(TString &path, const TString &def) const
+    {
+        if (path.IsNull())
+            path = def;
+        if (!path.EndsWith("/"))
+            path += "/";
+    }
 
 public:
     MDataSet() : fNumAnalysis((UInt_t)-1) { }
-    MDataSet(const char *fname);
+    MDataSet(const char *fname, TString sequences="", TString data="");
 
     // Getter
@@ -71 +88 @@
     Bool_t AddFilesOff(TChain &read) const;
 
+    void ReplaceDir(const TString &old, const TString &news)
+    {
+        ReplaceDir(fSequencesOn,  old, news);
+        ReplaceDir(fSequencesOff, old, news);
+    }
+
+    void ReplaceFile(const TString &old, const TString &news)
+    {
+        ReplaceFile(fSequencesOn,  old, news);
+        ReplaceFile(fSequencesOff, old, news);
+    }
+
     // TObject
     void Print(Option_t *o="") const;

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -337 +337 @@
     if (!str.CompareTo("Moon", TString::kIgnoreCase))
         return kMoon;
-
-    gLog << warn << "MSequence: LightCondition-tag not n/a, nomoon, twilight or moon." << endl;
+    if (!str.CompareTo("Day", TString::kIgnoreCase))
+        return kDay;
+
+    gLog << warn << "MSequence: LightCondition-tag not n/a, nomoon, twilight, moon or day." << endl;
     return kNA;
 }
@@ -353 +355 @@
 
     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);
@@ -414 +420 @@
     case kTwilight: gLog << "Twilight" << endl; break;
     case kMoon:     gLog << "Moon" << endl;     break;
+    case kDay:      gLog << "Day" << endl;     break;
     }
     gLog << "Start:          " << fStart << endl;

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -19 +19 @@
 {
 public:
-    enum LightCondition_t { kNA, kNoMoon, kTwilight, kMoon };
+    enum LightCondition_t { kNA, kNoMoon, kTwilight, kMoon, kDay };
     enum FileType_t {
         kRawDat, kRawPed, kRawCal, kRawAll,