Changeset 4895 for trunk

Timestamp:

09/09/04 15:43:47 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MParameters.cc (modified) (1 diff)
• manalysis/MParameters.h (modified) (3 diffs)
• mfileio/MReadReports.cc (modified) (2 diffs)
• mfileio/MReadReports.h (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (2 diffs)
• mfileio/MReadTree.h (modified) (2 diffs)
• mhbase/MH.cc (modified) (6 diffs)
• mjobs/MJPedestal.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
  2004/09/09: Thomas Bretz
 
-  * mhvstime/MHPixVsTime.[h,cc], mhvstime/MHVsTime.[h,cc],
-    mhvstime/MHSectorVsTime.[h,cc], mhbase/MH3.[h,cc]:
-    - changed such that the axis titles can be set via the 
-      title
+   * mhvstime/MHPixVsTime.[h,cc], mhvstime/MHVsTime.[h,cc],
+     mhvstime/MHSectorVsTime.[h,cc], mhbase/MH3.[h,cc]:
+     - changed such that the axis titles can be set via the 
+       title or (if available) a MBinning
+
+   * mhbase/MBinning.cc:
+     - added HasTitle
+
+   * mjobs/MJPedestal.cc:
+     - added lost UseData again to CheckEnvLocal
+
+   * mjobs/MJStar.cc:
+     - fixed handling of Axis titles of histograms
+
+   * mjobs/Makefile:
+     - added path to mhvstime
 
 

trunk/MagicSoft/Mars/manalysis/MParameters.cc

@@ -77 +77 @@
 }
 
+void MParameterD::Print(Option_t *o) const
+{
+    *fLog << all << GetDescriptor() << ":  Val=" << fVal << endl;
+}
+
+void MParameterDerr::Print(Option_t *o) const
+{
+    *fLog << all << GetDescriptor() << ":  Val=" << fVal << "  Err=" << fErr << endl;
+}
+
+void MParameterI::Print(Option_t *o) const
+{
+    *fLog << all << GetDescriptor() << ":  Val=" << fVal << endl;
+}

trunk/MagicSoft/Mars/manalysis/MParameters.h

@@ -17 +17 @@
     Double_t GetVal() const { return fVal; }
 
+    void Print(Option_t *o="") const;
+
     ClassDef(MParameterD, 1) // Container to hold a generalized parameters (double)
 };
@@ -33 +35 @@
     Double_t GetErr() const { return fErr; }
 
+    void Print(Option_t *o="") const;
+
     ClassDef(MParameterDerr, 1) // Container to hold a generalized parameters (double) and its Error
 };
@@ -46 +50 @@
     void SetVal(Int_t v) { fVal = v; }
     Int_t GetVal() const { return fVal; }
+
+    void Print(Option_t *o="") const;
 
     ClassDef(MParameterI, 1) // Container to hold a generalized parameters (integer)

trunk/MagicSoft/Mars/mfileio/MReadReports.cc

@@ -226 +226 @@
 Int_t MReadReports::PreProcess(MParList *plist)
 {
-    fList = (MTask*)plist->FindObject("MTaskList");
-
     fChains->Delete();
 
@@ -385 +383 @@
             const Int_t rc = task->CallProcess();
             if (rc)
-            {
-                fList->SetStreamId(task->GetName());
                 return rc;
-            }
         }
 

trunk/MagicSoft/Mars/mfileio/MReadReports.h

@@ -22 +22 @@
     TArrayL    fPosEntry; // Store the position in each tree/chain
     TArrayL    fPosTree;  // Number of Tree in file.
-
-    MTask     *fList;     // pointer to the task list to set the stream id
 
     Bool_t     fEnableAutoScheme;

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -601 +601 @@
 Int_t MReadTree::PreProcess(MParList *pList)
 {
+    fTaskList = (MTaskList*)pList->FindObject("MTaskList");
+    if (!fTaskList)
+        *fLog << warn << "WARNING - Standard tasklist MTaskList not found... ignoring Stream-ID." << endl;
+
     //
     // Make sure, that all the following calls doesn't result in
@@ -854 +858 @@
     const Bool_t rc = fChain->GetEntry(fNumEntry++) != 0;
 
+    if (fTaskList)
+        fTaskList->SetStreamId(fChain->GetName());
+
     if (rc)
         SetReadyToSave();

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -8 +8 @@
 class MChain;
 class TBranch;
+class MTaskList;
 
 class MReadTree : public MRead
@@ -24 +25 @@
     TList  *fVetoList;         // List of Branches which are not allowed to get enabled
     TList  *fNotify;           // List of TObjects to notify when switching files
+
+    MTaskList *fTaskList;      // Tasklist to set StreamId
 
     enum { kChainWasChanged = BIT(14) };

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -199 +199 @@
 #endif
 
+    // All this is reset by TAxis::Set
+    const TAttAxis att(x);
+    const Bool_t   tm(x.GetTimeDisplay());
+    const TString  tf(x.GetTimeFormat());
+
     //
     // This is a necessary workaround if one wants to set
@@ -211 +216 @@
     //
     x.Set(binsx->GetNumBins(), binsx->GetEdges());
+
+    // All this is reset by TAxis::Set
+    att.Copy(x);
+    x.SetTimeDisplay(tm);
+    x.SetTimeFormat(tf);
+
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,03,03)
     x.SetTitle(xtitle);
@@ -233 +244 @@
 #endif
 
+    // All this is reset by TAxis::Set
+    const TAttAxis attx(x);
+    const TAttAxis atty(y);
+    const Bool_t   tmx(x.GetTimeDisplay());
+    const Bool_t   tmy(y.GetTimeDisplay());
+    const TString  tfx(x.GetTimeFormat());
+    const TString  tfy(y.GetTimeFormat());
+
     //
     // This is a necessary workaround if one wants to set
@@ -247 +266 @@
     x.Set(binsx->GetNumBins(), binsx->GetEdges());
     y.Set(binsy->GetNumBins(), binsy->GetEdges());
+
+    // All this is reset by TAxis::Set
+    attx.Copy(x);
+    atty.Copy(y);
+    x.SetTimeDisplay(tmx);
+    y.SetTimeDisplay(tmy);
+    x.SetTimeFormat(tfx);
+    y.SetTimeFormat(tfy);
+
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,03,03)
     x.SetTitle(xtitle);
@@ -272 +300 @@
 #endif
 
+    // All this is reset by TAxis::Set
+    const TAttAxis attx(x);
+    const TAttAxis atty(y);
+    const TAttAxis attz(z);
+    const Bool_t   tmx(x.GetTimeDisplay());
+    const Bool_t   tmy(y.GetTimeDisplay());
+    const Bool_t   tmz(z.GetTimeDisplay());
+    const TString  tfx(x.GetTimeFormat());
+    const TString  tfy(y.GetTimeFormat());
+    const TString  tfz(z.GetTimeFormat());
+
     //
     // This is a necessary workaround if one wants to set
@@ -288 +327 @@
     y.Set(binsy->GetNumBins(), binsy->GetEdges());
     z.Set(binsz->GetNumBins(), binsz->GetEdges());
+
+    // All this is reset by TAxis::Set
+    attx.Copy(x);
+    atty.Copy(y);
+    attz.Copy(z);
+    x.SetTimeDisplay(tmx);
+    y.SetTimeDisplay(tmy);
+    z.SetTimeDisplay(tmz);
+    x.SetTimeFormat(tfx);
+    y.SetTimeFormat(tfy);
+    z.SetTimeFormat(tfz);
+
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,03,03)
     x.SetTitle(xtitle);

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -461 +461 @@
 */
 
+// --------------------------------------------------------------------------
+//
+// The following resource options are available:
+//   Prefix.DataCheckDisplay: Yes, No
+//   Prefix.DataCheck:        Yes, No
+//   Prefix.UseData:          Yes, No
+//
 Bool_t MJPedestal::CheckEnvLocal()
 {
@@ -467 +474 @@
 
     SetDataCheck(GetEnv("DataCheck", fDataCheck));
-    SetOverwrite(GetEnv("Overwrite", fOverwrite));
+    SetUseData(GetEnv("UseData", fUseData));
 
     return kTRUE;
@@ -565 +572 @@
     if (fSequence.IsValid())
     {
+        const TString type = fUseData ? "data" : "pedestal";
         const Int_t n0 = fUseData ? fSequence.SetupDatRuns(iter, fPathData) : fSequence.SetupPedRuns(iter, fPathData);
         const Int_t n1 = fUseData ? fSequence.GetNumDatRuns() : fSequence.GetNumPedRuns();
         if (n0==0)
         {
-            *fLog << err << "ERROR - No input files of sequence found!" << endl;
+            *fLog << err << "ERROR - No " << type << " input files of sequence found in " << fPathData << endl;
             return kFALSE;
         }
         if (n0!=n1)
         {
-            *fLog << err << "ERROR - Number of files found (" << n0 << ") doesn't match number of files in sequence (" << n1 << ")" << endl;
+            *fLog << err << "ERROR - Number of " << type << " files found (" << n0 << ") in " << fPathData << " doesn't match number of files in sequence (" << n1 << ")" << endl;
             return kFALSE;
         }