Changeset 6173

Timestamp:

02/01/05 15:51:16 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.rc (modified) (2 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (7 diffs)
• mjobs/MJCalibration.cc (modified) (10 diffs)
• mjobs/MJCalibration.h (modified) (3 diffs)
• mjobs/MJPedestal.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/callisto.rc

@@ -79 +79 @@
 # Type of used data format: raw, root, mc
 #MJCalibration.DataType: Root
-# Type of displayed plots
-#MJCalibration.Display: Full,DataCheck,Normal
+# Type of displayed plots: Full,DataCheck,Normal
+#MJCalibration.Display: datacheck
 # Write additinal debug output
 #MJCalibration.Debug: No
@@ -135 +135 @@
 #MJPedestalC2.DataType: Root
 #MJPedestalC3.DataType: Root
+# Type of displayed plots: Full,DataCheck,None
+#MJPedestalC1.Display: datacheck
+#MJPedestalC2.Display: datacheck
+#MJPedestalC3.Display: datacheck
 # Maximum number of event processed in the loop
 #MJPedestalC1.MaxEvents: 1000

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -122 +122 @@
     fTitle = title ? title : "Tool to calibrate data";
 
-    SetRootData();
+    SetUseRootData();
 }
 
@@ -192 +192 @@
     SetHiLoCalibration(GetEnv("HiLoCalibration", fIsHiLoCalibration));
 
-    SetRootData();
-
-    if (HasEnv("RawData"))
-    {
-      fDataFlag = 0;
-      SetRawData();
-    }
-
-    if (HasEnv("MC"))
-    {
-      fDataFlag = 0;
-      SetMC();
-    }
-
+    SetUseRootData();
+
+    TString dat = GetEnv("DataType", "");
+    if (dat.BeginsWith("raw", TString::kIgnoreCase))
+      {
+        fDataFlag = 0;
+        SetUseRawData();
+      }
+    if (dat.BeginsWith("root", TString::kIgnoreCase))
+      {
+        fDataFlag = 0;
+        SetUseRootData();
+      }
+    if (dat.BeginsWith("mc", TString::kIgnoreCase))
+      {
+        fDataFlag = 0;
+        SetUseMC();
+      }
+    
     return kTRUE;
 }
@@ -247 +252 @@
 
     MDirIter iter;
-    const Int_t n0 = fSequence.SetupDatRuns(iter, fPathData, "D", IsRawData());
+    const Int_t n0 = fSequence.SetupDatRuns(iter, fPathData, "D", IsUseRawData());
     const Int_t n1 = fSequence.GetNumDatRuns();
     if (n0==0)
@@ -364 +369 @@
     //read.DisableAutoScheme();
     MRawFileRead rawread(NULL);
-    if (IsRawData())
+    if (IsUseRawData())
         rawread.AddFiles(fSequence.IsValid() ? iter : *fRuns);
     else
@@ -464 +469 @@
     calib.SetSignalType(MCalibrateData::kPhe);
 
-    if (IsMC()) // MC file
+    if (IsUseMC()) // MC file
     {
         calib.SetCalibrationMode(MCalibrateData::kFfactor);
@@ -612 +617 @@
     tlist2.AddToList(&apply);
     tlist2.AddToList(&merge);
-    if (IsMC())
+    if (IsUseMC())
         tlist2.AddToList(&pcopy);
     else
@@ -678 +683 @@
 
     // Now setup main tasklist
-    tlist.AddToList(IsRawData() ? (MTask*)&rawread : (MTask*)&readreal);
-    if (IsRootData())
+    tlist.AddToList(IsUseRawData() ? (MTask*)&rawread : (MTask*)&readreal);
+    if (IsUseRootData())
       tlist2.AddToList(&pextr);
-    tlist.AddToList(&tlist2, IsRootData() ? "Events" : "All");
+    tlist.AddToList(&tlist2, IsUseRootData() ? "Events" : "All");
     if (fIsInterlaced)
       tlist.AddToList(&fill8);
 
-    if (IsMC())
+    if (IsUseMC())
       tlist.AddToList(&pcalc, "Drive");
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -51 +51 @@
 // 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 on raw data files.
-// 
 // The absolute light calibration devices Blind Pixel and PIN Diode can be switched on
 // and off with the commands:
@@ -146 +143 @@
 #include "MHCalibrationChargePINDiode.h"
 #include "MHCalibrationRelTimeCam.h"
+#include "MHCalibrationPix.h"
 
 #include "MReadMarsFile.h"
@@ -200 +198 @@
   
   SetRelTimeCalibration();
-  SetDataCheck(kFALSE);
   SetDebug(kFALSE);
   SetIntensity(kFALSE);
@@ -1411 +1408 @@
 Bool_t MJCalibration::CheckEnvLocal()
 {
+
     TString dis = GetEnv("Display", "");
     if (dis.BeginsWith("Full", TString::kIgnoreCase))
@@ -1419 +1417 @@
         SetNormalDisplay();
 
+    SetUseRootData();
+
+    TString dat = GetEnv("DataType", "");
+    if (dat.BeginsWith("raw", TString::kIgnoreCase))
+      {
+        fDataFlag = 0;
+        SetUseRawData();
+      }
+    if (dat.BeginsWith("root", TString::kIgnoreCase))
+      {
+        fDataFlag = 0;
+        SetUseRootData();
+      }
+    if (dat.BeginsWith("mc", TString::kIgnoreCase))
+      {
+        fDataFlag = 0;
+        SetUseMC();
+      }
+    
     SetRelTimeCalibration(GetEnv("RelTimeCalibration", IsRelTimes()));
     SetIntensity(GetEnv("IntensityCalibration", IsIntensity()));
-    SetDataCheck(GetEnv("DataCheck", IsDataCheck()));
     SetDebug(GetEnv("Debug", IsDebug()));
 
@@ -1427 +1443 @@
     SetUsePINDiode(GetEnv("UsePINDiode", IsUsePINDiode()));
     SetGeometry(GetEnv("Geometry", fGeometry));
-
-    SetRootData();
-
-    if (HasEnv("MC"))
-    {
-      fDataFlag = 0;
-      SetMC();
-    }
-
-    if (HasEnv("RawData") || IsDataCheck())
-    {
-      fDataFlag = 0;
-      SetRawData();
-    }
 
     fReferenceFile = GetEnv("ReferenceFile",fReferenceFile.Data());
@@ -1642 +1644 @@
     if (fSequence.IsValid())
     {
-        const Int_t n0 = fSequence.SetupCalRuns(iter, fPathData, "C", IsRawData());
+        const Int_t n0 = fSequence.SetupCalRuns(iter, fPathData, "C", IsUseRawData());
         const Int_t n1 = fSequence.GetNumCalRuns();
         if (n0==0)
@@ -1702 +1704 @@
     MRawFileRead rawread(NULL);
 
-    if (IsRawData())
+    if (IsUseRawData())
     {
         rawread.AddFiles(fSequence.IsValid() ? iter : *fRuns);
@@ -1720 +1722 @@
     MGeomApply               apply;
     apply.SetGeometry(fGeometry);
+
     MBadPixelsMerge          merge(&fBadPixels);
     MExtractPINDiode         pinext;
@@ -1873 +1876 @@
 
     tlist.PrintStatistics();
+    
+    /*
+    MHCalibrationRelTimeCam *hcam = (MHCalibrationRelTimeCam*)plist.FindObject("MHCalibrationRelTimeCam");
+    MHCalibrationPix &pix1 = (*hcam)(100);
+    pix1.DrawClone("");
+    gPad->SaveAs("test_time_100.ps");
+
+    MHCalibrationChargeCam *hccam = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
+    MHCalibrationPix &pix11 = (*hccam)(100);
+    pix11.DrawClone("");
+    gPad->SaveAs("test_charge_100.ps");
+
+    MHCalibrationPix &pix2 = (MHCalibrationPix&)(*hcam)(400);
+    pix2.DrawClone("");    
+    gPad->SaveAs("test_time_400.ps");
+
+    MHCalibrationPix &pix22 = (*hccam)(400);
+    pix22.DrawClone("");
+    gPad->SaveAs("test_charge_400.ps");
+
+    *fLog << err << "Blackout 100: " << fRelTimeCam[100].GetNumBlackout() << endl;
+    *fLog << err << "Picup    100: " << fRelTimeCam[100].GetNumPickup  () << endl;    
+    *fLog << err << "Blackout 400: " << fRelTimeCam[400].GetNumBlackout() << endl;
+    *fLog << err << "Picup    400: " << fRelTimeCam[400].GetNumPickup  () << endl;    
+    */
 
     if (!fCalibrationPINDiode.IsValid())

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -142 +142 @@
   Byte_t fStorage;                                     // Bit-field for chosen storage type
 
-  enum { kRelTimes, kDataCheck, kDebug, kIntensity };  // Possible flags
+  enum { kRelTimes, kDebug, kIntensity };  // Possible flags
 
   Byte_t fFlags;                                       // Bit-field for the flags
@@ -152 +152 @@
 
   Bool_t IsRelTimes     () const { return TESTBIT(fFlags,kRelTimes);       }
-  Bool_t IsDataCheck    () const { return TESTBIT(fFlags,kDataCheck);      }
   Bool_t IsDebug        () const { return TESTBIT(fFlags,kDebug);          }
   Bool_t IsIntensity    () const { return TESTBIT(fFlags,kIntensity);      }
@@ -213 +212 @@
   // Flags
   void SetRelTimeCalibration( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kRelTimes)  : CLRBIT(fFlags,kRelTimes); }
-  void SetDataCheck         ( const Bool_t b=kTRUE ) { b ? SetDataCheckDisplay(), SETBIT(fFlags,kDataCheck)
-                                                                                     : CLRBIT(fFlags,kDataCheck); }
   void SetDebug             ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kDebug)     : CLRBIT(fFlags,kDebug); }
   void SetIntensity         ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kIntensity) : CLRBIT(fFlags,kIntensity); }

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -96 +96 @@
 // - fRuns to 0, 
 // - fExtractor to NULL, 
-// - fDataCheck to kFALSE, 
 // - fExtractType to kUsePedRun
 // - fStorage to Normal Storage
@@ -103 +102 @@
 MJPedestal::MJPedestal(const char *name, const char *title) 
     : fRuns(0), fExtractor(NULL), fDisplayType(kDisplayDataCheck),
-      fDataCheck(kFALSE), fExtractType(kUsePedRun), fExtractionType(kFundamental)
+      fExtractType(kUsePedRun), fExtractionType(kFundamental)
 {
     fName  = name  ? name  : "MJPedestal";
@@ -731 +730 @@
 Bool_t MJPedestal::CheckEnvLocal()
 {
-    SetDataCheck(GetEnv("DataCheck", fDataCheck));
-
     if (HasEnv("Display"))
     {
@@ -744 +741 @@
             fDisplayType = kDisplayNone;
     }
+
+    SetUseRootData();
+
+    TString dat = GetEnv("DataType", "");
+    if (dat.BeginsWith("raw", TString::kIgnoreCase))
+      {
+        fDataFlag = 0;
+        SetUseRawData();
+      }
+    if (dat.BeginsWith("root", TString::kIgnoreCase))
+      {
+        fDataFlag = 0;
+        SetUseRootData();
+      }
+    if (dat.BeginsWith("mc", TString::kIgnoreCase))
+      {
+        fDataFlag = 0;
+        SetUseMC();
+      }
 
     if (HasEnv("UseData"))
@@ -869 +885 @@
     if (fSequence.IsValid())
     {
-        const Int_t n0 = IsUseData() ? fSequence.SetupDatRuns(iter, fPathData, "D", fDataCheck) : fSequence.SetupPedRuns(iter, fPathData, "P", fDataCheck);
+        const Int_t n0 = IsUseData() ? fSequence.SetupDatRuns(iter, fPathData, "D", IsUseRawData()) : fSequence.SetupPedRuns(iter, fPathData, "P", IsUseRawData());
         const Int_t n1 = IsUseData() ? fSequence.GetNumDatRuns() : fSequence.GetNumPedRuns();
         if (n0==0)
@@ -883 +899 @@
     }
 
-    if (fDataCheck)
+    if (IsUseRawData())
     {
         if (fRuns || fSequence.IsValid())