Changeset 8999 for trunk/MagicSoft/Mars/mjobs

Timestamp:

07/14/08 20:59:13 (16 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)
• MJExtractSignal.cc (modified) (1 diff)
• MJPedestal.cc (modified) (1 diff)
• MSequence.cc (modified) (7 diffs)
• MSequence.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -42 +42 @@
 #include "MLogManip.h"
 
-#include "MRunIter.h"
 #include "MParList.h"
 #include "MTaskList.h"

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -410 +410 @@
     MTriggerPatternDecode     decode;
 
-    MH3 hpat("MRawRunHeader.fRunNumber", "MTriggerPattern.GetUnprescaled");
-    hpat.SetWeight("1./MRawRunHeader.GetRunLength");
+    MH3 hpat("MRawRunHeader.GetFileID", "MTriggerPattern.GetUnprescaled");
+    hpat.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1)");
     hpat.SetName("TrigPat");
-    hpat.SetTitle("Rate of the trigger pattern [Hz];Run Number;Trigger Pattern;Rate [Hz]");
+    hpat.SetTitle("Rate of the trigger pattern [Hz];File Id;Trigger Pattern;Rate [Hz]");
     hpat.InitLabels(MH3::kLabelsXY);
     //hpat.DefineLabelsY("1=Lvl1;2=Cal;3=Cal;4=Lvl2;5=Cal;7=Cal;8=Ped;9=Ped+Trig;13=Ped+Trig;16=Pin;32=Sum");

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -105 +105 @@
 
 #include "MEnv.h"
-#include "MRunIter.h"
+#include "MDirIter.h"
 #include "MSequence.h"
 #include "MParList.h"

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc

@@ -38 +38 @@
 #include "MLogManip.h"
 
-#include "MRunIter.h"
 #include "MParList.h"
 #include "MTaskList.h"

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -52 +52 @@
 #include "MLogManip.h"
 
+#include "MDirIter.h"
 #include "MTaskEnv.h"
 #include "MSequence.h"
-#include "MRunIter.h"
 #include "MParList.h"
 #include "MTaskList.h"

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -379 +379 @@
 }
 
+TString MSequence::InflateRunPath(const MTime &night, Bool_t mc)
+{
+    TString rc = GetStandardPath(mc);
+    rc += "rawfiles/";
+    rc += night.GetStringFmt("%Y/%m/%d/");
+    return rc;
+}
+
+TString MSequence::InflateRunPath(const MTime &night, UShort_t tel, Int_t run, Int_t file, Int_t type)
+{
+    return InflateRunPath(night)+InflateRunName(night, tel, run, file, type);
+}
+
 // --------------------------------------------------------------------------
 //
@@ -421 +434 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Return the expression describing the file-name for the file defined
-// by i-th entry of the the given arrays. The file type identifier is
-// defined by type. The source name is replaced by a wildcard and
-// the extension is defined by the type as well.
-//
-TString MSequence::GetFileName(UInt_t i, const TArrayI &arr, const TArrayI &sub, FileType_t type) const
+TString MSequence::InflateRunName(const MTime &night, UShort_t tel, Int_t run, Int_t file, Int_t type)
 {
     const char *id="_";
@@ -458 +464 @@
 
     // ------------- Create file name --------------
-    TString n = fNight.GetStringFmt("%Y%m%d_");
-
-    if (arr[i]>999999)
-        n += "M1_";
-
-    // R. DeLosReyes and T. Bretz
-    // Changes to read the DAQ numbering format. Changes takes place
-    // between runs 35487 and 00035488 (2004_08_30)
-    n += Form(arr[i]>35487 || fMonteCarlo ? "%08d" : "%05d", arr[i]);
-
-    if (arr[i]>999999 && sub.GetSize()>0)
-        n += Form(".%05d", sub[i]);
+    TString n = night.GetStringFmt("%Y%m%d_");
+
+    // This is for MCs (FIXME!!!!)
+    if (run<0)
+        n += Form("%08d", -run);
+    else
+    {
+        if (tel>0)
+            n += Form("M%d_", tel);
+
+        // R. DeLosReyes and T. Bretz
+        // Changes to read the DAQ numbering format. Changes takes place
+        // between runs 35487 and 00035488 (2004_08_30)
+        n += Form(run>35487 ? "%08d" : "%05d", run);
+
+        if (tel>0)
+            n += Form(".%05d", file);
+    }
 
     n += "_";
@@ -475 +487 @@
     n += "_*";
 
-    if (arr[i]<1000000)
+    if (tel==0)
         n += "_E";
 
@@ -484 +496 @@
     case kRawCal:
     case kRawAll:
-        n += ".raw.?g?z?";
+        n += ".raw.?g?z?";  // TPRegexp: (\.gz)?
         break;
     default:
@@ -491 +503 @@
 
     return n;
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the expression describing the file-name for the file defined
+// by i-th entry of the the given arrays. The file type identifier is
+// defined by type. The source name is replaced by a wildcard and
+// the extension is defined by the type as well.
+//
+TString MSequence::GetFileName(UInt_t i, const TArrayI &arr, const TArrayI &sub, FileType_t type) const
+{
+    const Int_t tel = 1;
+    return InflateRunName(fNight, arr[i]>999999?tel:0, fMonteCarlo?-arr[i]:arr[i], sub.GetSize()>0?sub[i]:0, type);
 }
 
@@ -1183 +1208 @@
 // Returns if file accessible or not.
 //
-Bool_t MSequence::InflatePath(TString &seq, Bool_t ismc)
+Bool_t MSequence::InflateSeq(TString &seq, Bool_t ismc)
 {
     if (seq.IsDigit())

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -27 +27 @@
 
     UInt_t fSequence;          // Sequence number
+
+    // FIXME: UShort_t fTelescopeNumber ???
 
     MTime  fStart;             // Start time of sequence
@@ -170 +172 @@
     const TString &GetDataPath() const { return fDataPath; }
 
-    const TString GetStandardPath() const { return fMonteCarlo?"/magic/montecarlo/":"/magic/data/"; }
+    const TString  GetStandardPath() const { return GetStandardPath(fMonteCarlo); }
 
-    static Bool_t InflatePath(TString &seq, Bool_t ismc=kFALSE);
+    // Static function for external access
+    static TString GetStandardPath(Bool_t mc) { return mc?"/magic/montecarlo/":"/magic/data/"; }
+    static Bool_t  InflateSeq(TString &seq, /*FIXME: TELNUM*/ Bool_t ismc=kFALSE);
+
+    static TString InflateRunName(const MTime &night, UShort_t tel, Int_t run, Int_t file, Int_t type=kRawAll);
+    static TString InflateRunName(const MTime &night, Int_t run, Int_t type=kRawAll) { return InflateRunName(night, 1, run, 0, type); }
+
+    static TString InflateRunPath(const MTime &night, UShort_t tel, Int_t run, Int_t file=0, Int_t type=kRawAll);
+    static TString InflateRunPath(const MTime &night, Int_t run, Int_t type=kRawAll) { return InflateRunPath(night, 1, run, 0, type); }
+
+    static TString InflateRunPath(const MTime &night, Bool_t mc=kFALSE);
 
     ClassDef(MSequence, 5) // Describes a sequences, reads and writes sequence files