Changeset 3043 for trunk

Timestamp:

02/06/04 17:36:05 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (5 diffs)
• mhist/MHPixVsTime.cc (modified) (3 diffs)
• mhist/MHPixVsTime.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/02/06: Thomas Bretz
+
+  * mhist/MHPixVsTime.[h,cc]:
+    - changed such that you can set the name of the time container now 
+
+
+
  2004/02/06: Oscar Blanch
+
   * mmc/MFadcDefine.h && mmc/MMcFadcHeader.cxx
-    _ We cahnged the name (and values) of the global variable
+    - We cahnged the name (and values) of the global variable
        MFADC_RESPONSE_AMPLITUDE to  MFADC_RESPONSE_INTEGRAL
 
+
+
  2004/02/05: Markus Gaug
+
    * mcalib/MHCalibrationPixel.[h,cc]
      - put an NDF limit for the fit
@@ -15 +26 @@
      - Check for nan's of all returned fit values
 
-   * mcalib/MCalibrationPix.[h,cc]
-   * mcalib/MCalibrationCam.cc
+   * mcalib/MCalibrationPix.[h,cc], mcalib/MCalibrationCam.cc:
      - reshuffled HiLoGainConversion, calculation of F-Factor method, 
      - calculation of total F-Factor of the readout.
@@ -72 +82 @@
 
 
+
  2004/02/05: Abelardo Moralejo
 
@@ -80 +91 @@
        we will use it for calibrated real data (to be changed if so).
 
+
+
  2004/02/05: Sebastian Raducci
 
@@ -95 +108 @@
      - test macro. Shows how to use the MCubicSpline class
      - it could be used to test the methods of the Spline class
-      
+
+
 
  2004/02/05: Thomas Bretz

trunk/MagicSoft/Mars/mhist/MHPixVsTime.cc

@@ -66 +66 @@
     TString t("Pixel Index #");
     t += idx;
-    t += " vs ";
-    t += fUseEventTime ? "Time" : "Event Number";
+    t += " vs Time";
 
     fGraph.SetName("MCamEvent");
@@ -108 +107 @@
     }
 
-    if (fUseEventTime)
-    {
-        fTime = (MTime*)plist->FindObject("MTime");
+    if (!fNameTime.IsNull())
+    {
+        fTime = (MTime*)plist->FindObject(fNameTime, "MTime");
         if (!fTime)
         {
-            *fLog << err << "MTime not found... abort." << endl;
+            *fLog << err << fNameTime << " [MTime] not found... abort." << endl;
             return kFALSE;
         }
@@ -149 +148 @@
 
     Double_t t = 0;
-    if (fUseEventTime)
+    if (!fNameTime.IsNull())
         t = fTime->GetAxisTime();
     else

trunk/MagicSoft/Mars/mhist/MHPixVsTime.h

@@ -30 +30 @@
 
     TString fNameEvt;
+    TString fNameTime;
 
     Int_t fType;
     Int_t fTypeErr;
-
-    Bool_t fUseEventTime;
 
     Bool_t SetupFill(const MParList *pList);
@@ -45 +44 @@
 
     void SetNameEvt(const TString name) { fNameEvt = name; }
+    void SetNameTime(const TString name) { fNameTime = name; }
     void SetType(Int_t type, Int_t e=-1) { fType = type; fTypeErr=e; }
 
     TH1 *GetHistByName(const TString name="");
     TGraph &GetGraph() { return fGraph; }
-
-    void SetUseEventTime(Bool_t use = kTRUE) { fUseEventTime = use; }
 
     void Draw(Option_t *o="");