Changeset 4795

Timestamp:

08/29/04 18:08:24 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (5 diffs)
• mjobs/MJCalibration.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
     - added in datacheck-display of MJCalibration
 
-  * mcalib/MHCalibrationChargeHiGainPix.cc
-  * mcalib/MHCalibrationChargeLoGainPix.cc
+  * mcalib/MHCalibrationChargeHiGainPix.[h,cc]
+  * mcalib/MHCalibrationChargeLoGainPix.[h,cc]
     - default lower histogram limit moved to -100.5
+
+  * mcalib/MHCalibrationCam.h
+  * mcalib/MHCalibrationChargeCam.cc
+    - make TArrayI out of fOverFlowHiGain and fOverFlowLoGain
+
+  * mjobs/MJCalibration.[h,cc]
+    - finished datacheck display with the arrival times.
 
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -166 +166 @@
 const Double_t MJCalibration::fgQEMin                     = 0.;
 const Double_t MJCalibration::fgQEMax                     = 0.3;
+const Double_t MJCalibration::fgArrivalTimeMin            = 1.;
+const Double_t MJCalibration::fgArrivalTimeMax            = 10.;
 
 const Float_t  MJCalibration::fgRefConvFADC2PheInner      = 0.14;       
@@ -173 +175 @@
 const Float_t  MJCalibration::fgRefQEInner                = 0.18;            
 const Float_t  MJCalibration::fgRefQEOuter                = 0.12;
-
-
+const Float_t  MJCalibration::fgRefArrivalTimeInner       = 4.5;            
+const Float_t  MJCalibration::fgRefArrivalTimeOuter       = 5.0;
+const Float_t  MJCalibration::fgRefArrivalTimeRmsInner    = 0.5;            
+const Float_t  MJCalibration::fgRefArrivalTimeRmsOuter    = 0.5;
 // --------------------------------------------------------------------------
 //
@@ -668 +672 @@
       if (geomcam.InheritsFrom("MGeomCamMagic"))
         DisplayDoubleProject(&disp35, "noisy", "dead");
+
+      //
+      // ARRIVAL TIMES
+      // 
+      TCanvas &c3 = fDisplay->AddTab("ArrivalTimes");
+      c3.Divide(2,3);
+      
+      c3.cd(1);
+      gPad->SetBorderMode(0);
+      gPad->SetTicks();
+      MHCamera *obj10=(MHCamera*)disp28.DrawCopy("hist");
+      //
+      // for the datacheck, fix the ranges!!
+      //
+      obj10->SetMinimum(fgArrivalTimeMin);
+      obj10->SetMaximum(fgArrivalTimeMax);
+      //
+      // Set the datacheck sizes:
+      //
+      FixDataCheckHist((TH1D*)obj10);
+      obj10->SetStats(kFALSE);
+      //
+      // set reference lines
+      //
+      DisplayReferenceLines(obj10,3);
+      
+      c3.cd(3);
+      gPad->SetBorderMode(0);
+      obj10->SetPrettyPalette();
+      obj10->Draw();
+      
+      c3.cd(5);
+      gPad->SetBorderMode(0);
+      if (geomcam.InheritsFrom("MGeomCamMagic"))
+        DisplayDoubleProject(&disp28, "early", "late");
+
+      //
+      // ARRIVAL TIMES JITTER
+      // 
+      c3.cd(2);
+      gPad->SetBorderMode(0);
+      gPad->SetTicks();
+      MHCamera *obj11=(MHCamera*)disp29.DrawCopy("hist");
+      //
+      // for the datacheck, fix the ranges!!
+      //
+      //      obj11->SetMinimum(fgArrivalTimeMin);
+      //      obj11->SetMaximum(fgArrivalTimeMax);
+      //
+      // Set the datacheck sizes:
+      //
+      FixDataCheckHist((TH1D*)obj11);
+      obj11->SetStats(kFALSE);
+      //
+      // set reference lines
+      //
+      DisplayReferenceLines(obj11,4);
+      
+      c3.cd(4);
+      gPad->SetBorderMode(0);
+      obj11->SetPrettyPalette();
+      obj11->Draw();
+      
+      c3.cd(6);
+      gPad->SetBorderMode(0);
+      if (geomcam.InheritsFrom("MGeomCamMagic"))
+        DisplayDoubleProject(&disp29, "", "jittering");
+
 
       //
@@ -1032 +1104 @@
   else if (what == 2)
     l1 = line.DrawLine(0, fgRefConvFADC2PheInner, x, fgRefConvFADC2PheInner );
+  else if (what == 3)
+    l1 = line.DrawLine(0, fgRefArrivalTimeInner, x, fgRefArrivalTimeInner );
+  else if (what == 4)
+    l1 = line.DrawLine(0, fgRefArrivalTimeRmsInner, x, fgRefArrivalTimeRmsInner );
   
   if (geom->InheritsFrom("MGeomCamMagic"))
@@ -1047 +1123 @@
         case 2:
           line.DrawLine(x2, fgRefConvFADC2PheOuter, 398, fgRefConvFADC2PheOuter);
+          break;
+        case 3:
+          line.DrawLine(x2, fgRefArrivalTimeOuter, 398, fgRefArrivalTimeOuter);
+          break;
+        case 4:
+          line.DrawLine(x2, fgRefArrivalTimeRmsOuter, 398, fgRefArrivalTimeRmsOuter);
           break;
         }

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -51 +51 @@
   static const Double_t fgQEMin;                       //! Histogram minimum for quantum efficiency
   static const Double_t fgQEMax;                       //! Histogram maximum for quantum efficiency
+  static const Double_t fgArrivalTimeMin;              //! Histogram minimum for arrival times 
+  static const Double_t fgArrivalTimeMax;              //! Histogram maximum for arrival times
   
   static const Float_t  fgRefConvFADC2PheInner;        //! Reference value for the conversion factor to phes - inner
@@ -58 +60 @@
   static const Float_t  fgRefQEInner;                  //! Reference value for the quantum eff. cascades - inner
   static const Float_t  fgRefQEOuter;                  //! Reference value for the quantum eff. cascades - outer
+  static const Float_t  fgRefArrivalTimeInner;         //! Reference value for the arrival time - inner
+  static const Float_t  fgRefArrivalTimeOuter;         //! Reference value for the arrival time - outer
+  static const Float_t  fgRefArrivalTimeRmsInner;      //! Reference value for the arrival time - inner
+  static const Float_t  fgRefArrivalTimeRmsOuter;      //! Reference value for the arrival time - outer
 
   MRunIter       *fRuns;                               // Calibration files