Changeset 8452 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/27/07 11:05:11 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (7 diffs)
• MJCalibration.cc (modified) (11 diffs)
• calibrationref.rc (modified) (1 diff)
• calibrationref_Dec04.rc (modified) (1 diff)
• calibrationref_Nov04.rc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -69 +69 @@
 
 #include "MCalibConstCam.h"
-#include "MCalibrationIntensityChargeCam.h"
 
 #include "MHCalibrationChargeCam.h"
@@ -125 +124 @@
 //
 MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
-    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE), fIsMovieMode(kFALSE)
+    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kTRUE), fIsMovieMode(kFALSE)
 {
     fName  = name  ? name  : "MJCalibrateSignal";
@@ -250 +249 @@
 
     // Read File
-    MCalibrationIntensityChargeCam      ichcam;
-
     MHCalibrationChargeCam      hchacam;
     MHCalibrationChargeBlindCam hbndcam;
@@ -276 +273 @@
     if (fIsInterlaced)
     {
-        interlacedcont.Add(&ichcam);
         interlacedcont.Add(&hchacam);
         if (IsUseBlindPixel())
@@ -531 +527 @@
 
     MCalibrationChargeCalc  chcalc;
+    chcalc.SetContinousCalibration();
     chcalc.SetExtractor(extractor3);
 
@@ -546 +543 @@
 
     //
-    // Intensity Calibration histogramming
+    // Calibration histogramming
     //
     MFillH filpin(&hpndiod, "MExtractedSignalPINDiode",   "FillPINDiode");
@@ -695 +692 @@
     tlist3.SetFilter(&fcalib);
 
-    //MFDataPhrase filcalco("MCalibrationIntensityConstCam.IsReadyToSave>0.5", "CalibConstFilter");
+    //MFDataPhrase filcalco("MCalibrationConstCam.IsReadyToSave>0.5", "CalibConstFilter");
     if (fIsInterlaced)
     {

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -19 +19 @@
 !   Author(s): Markus Gaug, 02/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -218 +218 @@
   fRefConvFADC2PheInner      = 0.14;
   fRefConvFADC2PheOuter      = 0.52;
-  fRefQEInner                = 0.18;            
+  fRefQEInner                = 0.18;
   fRefQEOuter                = 0.12;
-  fRefArrivalTimeInner       = 4.5;            
+  fRefArrivalTimeInner       = 4.5;
   fRefArrivalTimeOuter       = 5.0;
-  fRefArrivalTimeRmsInner    = 0.5;            
+  fRefArrivalTimeRmsInner    = 0.5;
   fRefArrivalTimeRmsOuter    = 0.5;
-  fRefTimeOffsetInner        = -0.23;    
-  fRefTimeOffsetOuter        = 0.39;    
-  fRefTimeResolutionInner    = 0.153;
-  fRefTimeResolutionOuter    = 0.128;
+  fRefTimeOffsetOuter        = 0.62;
+  fRefTimeResolutionInner    = 0.12;
+  fRefTimeResolutionOuter    = 0.09;
 
 }
@@ -813 +812 @@
       // for the datacheck, fix the ranges!!
       //
-      const Double_t max = 11.;
+      const Double_t max = 12.;
       obj8->SetMinimum(0.);
       obj8->SetMaximum(max);
@@ -825 +824 @@
       const Int_t numcol = gStyle->GetNumberOfColors()-3;
       
-      TPaveText *pave = new TPaveText(0.05,0.02,0.975,0.99);
+      TPaveText *pave = new TPaveText(0.05,0.02,0.975,0.999);
       pave->SetBit(kCanDelete);
       pave->ConvertNDCtoPad();
@@ -866 +865 @@
       t17->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol)));
       t17->SetTextAlign(12);
+      TText *t18 = pave->AddText(Form("Deviating Rel. Arrival Time RMS:                %3i pixels",
+                                       CountBadPixels(&disp24,10 )));
+      t18->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol)));
+      t18->SetTextAlign(12);
       TText *t15= pave->AddText(Form("Too many Low-Gain Blackout Events:       %3i pixels",
-                                       CountBadPixels(&disp24,10 )));
-      t15->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol)));
+                                       CountBadPixels(&disp24,11 )));
+      t15->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol)));
       t15->SetTextAlign(12);
       TText *t14= pave->AddText(Form("Previously Excluded:                                   %3i pixels",
-                                       CountBadPixels(&disp24,11)));
-      t14->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol)));
+                                       CountBadPixels(&disp24,12)));
+      t14->SetTextColor(gStyle->GetColorPalette(Int_t(12./max*numcol)));
       t14->SetTextAlign(12);
       pave->Draw();
@@ -903 +906 @@
       gStyle->SetPalette(1);
       
-      TPaveText *pave2 = new TPaveText(0.025,0.02,0.95,0.99);
+      TPaveText *pave2 = new TPaveText(0.025,0.02,0.95,0.999);
       pave2->SetBit(kCanDelete);
       pave2->ConvertNDCtoPad();
@@ -1239 +1242 @@
       break;
     case 5:
-      l1 = line.DrawLine(0, fRefTimeOffsetInner, x, fRefTimeOffsetInner );
+      l1 = line.DrawLine(0, 0, x, 0);
       break;
     case 6:
@@ -1391 +1394 @@
 //   RefArrivalTimeRmsOuter
 //
-//   RefTimeOffsetInner
 //   RefTimeOffsetOuter
 //   RefTimeResolutionInner
@@ -1425 +1427 @@
     fRefArrivalTimeRmsInner = refenv.GetValue("RefArrivalTimeRmsInner",fRefArrivalTimeRmsInner);
     fRefArrivalTimeRmsOuter = refenv.GetValue("RefArrivalTimeRmsOuter",fRefArrivalTimeRmsOuter);
-    fRefTimeOffsetInner     = refenv.GetValue("RefTimeOffsetInner",fRefTimeOffsetInner);
     fRefTimeOffsetOuter     = refenv.GetValue("RefTimeOffsetOuter",fRefTimeOffsetOuter);
     fRefTimeResolutionInner = refenv.GetValue("RefTimeResolutionInner",fRefTimeResolutionInner);
@@ -1894 +1895 @@
     tlist.AddToList(&cont);
 
-    if (IsRelTimes())
-    {
-        tlist.AddToList(&filltme);
-        tlist.AddToList(&timecalc);
-    }
-
     tlist.AddToList(&fillcam);
 
@@ -1909 +1904 @@
     tlist.AddToList(&calcalc);
 
+    if (IsRelTimes())
+    {
+        tlist.AddToList(&filltme);
+        tlist.AddToList(&timecalc);
+    }
 
     MHCamEvent evt2(0, "Extra'd", "Extracted Calibration Signal;;S [cnts/sl]");

trunk/MagicSoft/Mars/mjobs/calibrationref.rc

@@ -63 +63 @@
 # Relative Time Calibration:
 #
-RefTimeOffsetInner:       -0.23
-RefTimeOffsetOuter:       0.39    
-RefTimeResolutionInner:   0.153
-RefTimeResolutionOuter:   0.128
+RefTimeOffsetOuter:       0.62    
+RefTimeResolutionInner:   0.12
+RefTimeResolutionOuter:   0.09
 #
 # Mean Absolute Time:

trunk/MagicSoft/Mars/mjobs/calibrationref_Dec04.rc

@@ -63 +63 @@
 # Relative Time Calibration:
 #
-RefTimeOffsetInner:       -0.23
-RefTimeOffsetOuter:       0.39    
-RefTimeResolutionInner:   0.153
-RefTimeResolutionOuter:   0.128
+RefTimeOffsetOuter:       0.62
+RefTimeResolutionInner:   0.12
+RefTimeResolutionOuter:   0.09
 #
 # Mean Absolute Time:

trunk/MagicSoft/Mars/mjobs/calibrationref_Nov04.rc

@@ -63 +63 @@
 # Relative Time Calibration:
 #
-RefTimeOffsetInner:       -0.23
-RefTimeOffsetOuter:       0.39    
-RefTimeResolutionInner:   0.153
-RefTimeResolutionOuter:   0.128
+RefTimeOffsetOuter:       0.62
+RefTimeResolutionInner:   0.12
+RefTimeResolutionOuter:   0.09
 #
 # Mean Absolute Time: