Changeset 3797 for trunk/MagicSoft

Timestamp:

04/22/04 16:21:43 (21 years ago)

Author:

reyes

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (8 diffs)
• MJCalibration.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -48 +48 @@
 // 
 // If the flag SetFullDisplay() is set, all MHCameras will be displayed. 
-// if the flag SetDataCheck() is set, only the most important ones are displayed 
+// if the flag SetDataCheckDisplay() is set, only the most important ones are displayed 
 // Otherwise, (default: SetNormalDisplay()), a good selection of plots is given
 //
+// If the flag SetDataCheck() is set, the calibration is used as in the data check at 
+// La Palma, which mean especially running it on raw data files.
+// 
 // See also: MHCalibrationChargePix, MHCalibrationChargeCam, MHGausEvents
 //           MHCalibrationChargeBlindPix, MHCalibrationChargePINDiode
@@ -114 +117 @@
 
 #include "MReadMarsFile.h"
+#include "MRawFileRead.h"
 #include "MGeomApply.h"
 #include "MBadPixelsMerge.h"
@@ -146 +150 @@
 MJCalibration::MJCalibration(const char *name, const char *title) 
     : fRuns(0), fColor(MCalibrationCam::kNONE), fDisplayType(kNormalDisplay),
-      fRelTimes(kFALSE), fExtractorLevel(2), fArrivalTimeLevel(2)
+      fRelTimes(kFALSE), fDataCheck(kFALSE), fExtractorLevel(2), fArrivalTimeLevel(2)
 {
   fName  = name  ? name  : "MJCalibration";
@@ -241 +245 @@
 //
 // If the flag SetFullDisplay() is set, all MHCameras will be displayed. 
-// if the flag SetDataCheck() is set, only the most important ones are displayed 
+// if the flag SetDataCheckDisplay() is set, only the most important ones are displayed 
 // and otherwise, (default: SetNormalDisplay()), a good selection of plots is given
 //
@@ -422 +426 @@
     gStyle->SetOptFit();
 
-    if (fDisplayType == kDataCheck)
+    if (fDisplayType == kDataCheckDisplay)
       {
         TCanvas &c1 = fDisplay->AddTab("Fit.Charge");
@@ -935 +939 @@
   *fLog << endl;
   
+  // Setup Tasklist
+  MParList plist;
+  MTaskList tlist;
+  plist.AddToList(&tlist);
+  
   MReadMarsFile read("Events");
-  read.DisableAutoScheme();
-  static_cast<MRead&>(read).AddFiles(*fRuns);
-  
+  MRawFileRead rawread("");
+
+  if (fDataCheck)
+  {
+//     rawread.AddFiles(*fRuns); 
+     tlist.AddToList(&rawread);
+  }
+  else
+  {
+      read.DisableAutoScheme();
+      static_cast<MRead&>(read).AddFiles(*fRuns);
+      tlist.AddToList(&read);
+  }
+
+
   MCalibrationChargePINDiode pindiode;
   MCalibrationChargeBlindPix blindpix;
   
-  // Setup Tasklist
-  MParList plist;
   plist.AddToList(&pedcam);
   plist.AddToList(&fBadPixels);
@@ -951 +970 @@
   plist.AddToList(&blindpix);
 
-  MTaskList tlist;
-  plist.AddToList(&tlist);
-  
   MGeomApply               apply;
   //    MBadPixelsMerge          merge(&fBadPixels);
@@ -988 +1004 @@
   MContinue cont(&cosmics);
   
-  tlist.AddToList(&read);
   //    tlist.AddToList(&merge);
   tlist.AddToList(&apply);

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -36 +36 @@
   MCalibrationCam::PulserColor_t fColor;                   // Colour of the pulsed LEDs
 
-  enum  Display_t   { kFullDisplay, kDataCheck, kNormalDisplay }; // Possible Display types
+  enum  Display_t   { kFullDisplay, kDataCheckDisplay, kNormalDisplay }; // Possible Display types
   
   Display_t fDisplayType;                                  // Chosen Display type
 
   Bool_t fRelTimes;                                        // Flag if relative times have to be calibrated
+  Bool_t fDataCheck;                                       // Flag if the data check is run on raw data
   UInt_t fExtractorLevel;                                  // Level signal extractor (e.g. MExtractSignal2) 
   UInt_t fArrivalTimeLevel;                                // Level arr. time extractor (e.g. MArrivalTimeCalc2)
@@ -71 +72 @@
 
   // Displays
-  void SetFullDisplay()    { fDisplayType = kFullDisplay;   }
-  void SetDataCheck()      { fDisplayType = kDataCheck;     }
-  void SetNormalDisplay()  { fDisplayType = kNormalDisplay; }
+  void SetFullDisplay()      { fDisplayType = kFullDisplay;      }
+  void SetDataCheckDisplay() { fDisplayType = kDataCheckDisplay; }
+  void SetNormalDisplay()    { fDisplayType = kNormalDisplay;    }
 
   // Rel. Time
   void SetRelTimeCalibration(const Bool_t b=kTRUE) { fRelTimes         = b; }
+
+  // Data Check
+  void SetDataCheck         (const Bool_t b=kTRUE) { fDataCheck        = b; SetDataCheckDisplay(); }
 
   // Extractors