Changeset 4789 for trunk

Timestamp:

08/29/04 16:22:14 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationChargeLoGainPix.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
  
   * mbadpixels/MBadPixelsPix.[h,cc] 
+  * mbadpixels/MBadPixelsCam.cc
+  * mjobs/MJCalibration.cc 
     - introduced new calibration bits: kHiGainOverFlow 
       and kLoGainOverFlow being filled when the calibration histograms 
       overflow. Will cause an kUnsuitableRun afterwards. 
+    - added in datacheck-display of MJCalibration
+
+  * mcalib/MHCalibrationChargeLoGainPix.cc
+    - default lower histogram limit moved to -100.5
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc

@@ -40 +40 @@
 using namespace std;
 
-const Int_t   MHCalibrationChargeLoGainPix::fgChargeNbins     = 500;
-const Axis_t  MHCalibrationChargeLoGainPix::fgChargeFirst     = -0.5;
+const Int_t   MHCalibrationChargeLoGainPix::fgChargeNbins     = 600;
+const Axis_t  MHCalibrationChargeLoGainPix::fgChargeFirst     = -100.5;
 const Axis_t  MHCalibrationChargeLoGainPix::fgChargeLast      = 499.5;
 const Int_t   MHCalibrationChargeLoGainPix::fgAbsTimeNbins    = 15;

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -707 +707 @@
       t2->SetTextColor(gStyle->GetColorPalette(Int_t(2./max*numcol + 1.)));
       t2->SetTextAlign(12);
-      TText *t3 = pave->AddText(Form("Signal Sigma smaller than Pedestal RMS: %3i pixels",
+      TText *t4 = pave->AddText(Form("Low Gain Saturation:                                   %3i pixels",
                                        CountBadPixels(&disp24,3)));
-      t3->SetTextColor(gStyle->GetColorPalette(Int_t(3./max*numcol + 1.)));
-      t3->SetTextAlign(12);
-      TText *t4 = pave->AddText(Form("Low Gain Saturation:                                   %3i pixels",
-                                       CountBadPixels(&disp24,4)));
-      t4->SetTextColor(gStyle->GetColorPalette(Int_t(4./max*numcol + 1.)));
+      t4->SetTextColor(gStyle->GetColorPalette(Int_t(3./max*numcol + 1.)));
       t4->SetTextAlign(12);
       TText *t5 = pave->AddText(Form("Mean Arr. Time In First Extraction Bin:      %3i pixels",
-                                       CountBadPixels(&disp24,5)));
-      t5->SetTextColor(gStyle->GetColorPalette(Int_t(5./max*numcol + 1.)));
+                                       CountBadPixels(&disp24,4)));
+      t5->SetTextColor(gStyle->GetColorPalette(Int_t(4./max*numcol + 1.)));
       t5->SetTextAlign(12);
       TText *t6 = pave->AddText(Form("Mean Arr. Time In Last 2 Extraction Bins: %3i pixels",
-                                       CountBadPixels(&disp24,6)));
-      t6->SetTextColor(gStyle->GetColorPalette(Int_t(6./max*numcol + 1.)));
+                                       CountBadPixels(&disp24,5)));
+      t6->SetTextColor(gStyle->GetColorPalette(Int_t(5./max*numcol + 1.)));
       t6->SetTextAlign(12);
       TText *t7 = pave->AddText(Form("Deviating Number of Photo-electrons:      %3i pixels",
+                                       CountBadPixels(&disp24,6)));
+      t7->SetTextColor(gStyle->GetColorPalette(Int_t(6./max*numcol + 1.)));
+      t7->SetTextAlign(12);
+      TText *t8 = pave->AddText(Form("Deviating global F-Factor:                           %3i pixels",
                                        CountBadPixels(&disp24,7)));
-      t7->SetTextColor(gStyle->GetColorPalette(Int_t(7./max*numcol + 1.)));
-      t7->SetTextAlign(12);
-      TText *t8 = pave->AddText(Form("Deviating global F-Factor:                         %3i pixels",
+      t8->SetTextColor(gStyle->GetColorPalette(Int_t(7./max*numcol + 1.)));
+      t8->SetTextAlign(12);
+      TText *t9 = pave->AddText(Form("Deviating Number of Photons:                    %3i pixels",
                                        CountBadPixels(&disp24,8)));
-      t8->SetTextColor(gStyle->GetColorPalette(Int_t(8./max*numcol + 1.)));
-      t8->SetTextAlign(12);
-      TText *t9 = pave->AddText(Form("Deviating Number of Photons:                  %3i pixels",
-                                       CountBadPixels(&disp24,9)));
-      t9->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol + 1.)));
+      t9->SetTextColor(gStyle->GetColorPalette(Int_t(8./max*numcol + 1.)));
       t9->SetTextAlign(12);
-      TText *t10= pave->AddText(Form("Previously Excluded:                                  %3i pixels",
+      TText *t10= pave->AddText(Form("High-Gain Histogram Overflow:                  %3i pixels",
+                                       CountBadPixels(&disp24,9 )));
+      t10->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol + 1.)));
+      t10->SetTextAlign(12);
+      TText *t11= pave->AddText(Form("Low-Gain Histogram Overflow:                    %3i pixels",
                                        CountBadPixels(&disp24,10)));
-      t10->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol + 1.)));
-      t10->SetTextAlign(12);
+      t11->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol + 1.)));
+      t11->SetTextAlign(12);
+      TText *t12= pave->AddText(Form("Previously Excluded:                                     %3i pixels",
+                                       CountBadPixels(&disp24,11)));
+      t12->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol + 1.)));
+      t12->SetTextAlign(12);
       pave->Draw();
 
@@ -773 +777 @@
       pave2->SetTextSize(0.05);
       pave2->AddText("  ");
+      TText *t3 = pave2->AddText(Form("Signal Sigma smaller Pedestal RMS:      %3i pixels",
+                                       CountBadPixels(&disp24,1)));
+      t3->SetTextColor(gStyle->GetColorPalette(Int_t(1./max*numcol + 1.)));
+      t3->SetTextAlign(12);
       TText *tt1 = pave2->AddText(Form("High Gain Signals could not be fitted:   %3i pixels",
-                                       CountBadPixels(&disp25,1)));
-      tt1->SetTextColor(gStyle->GetColorPalette(Int_t(1./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,2)));
+      tt1->SetTextColor(gStyle->GetColorPalette(Int_t(2./max2*numcol + 1.)));
       tt1->SetTextAlign(12);
       TText *tt2 = pave2->AddText(Form("Low  Gain Signals could not be fitted:   %3i pixels",
-                                       CountBadPixels(&disp25,2)));
-      tt2->SetTextColor(gStyle->GetColorPalette(Int_t(2./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,3)));
+      tt2->SetTextColor(gStyle->GetColorPalette(Int_t(3./max2*numcol + 1.)));
       tt2->SetTextAlign(12);
       TText *tt3 = pave2->AddText(Form("Relative Arr. Times could not be fitted:  %3i pixels",
-                                       CountBadPixels(&disp25,3)));
-      tt3->SetTextColor(gStyle->GetColorPalette(Int_t(3./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,4)));
+      tt3->SetTextColor(gStyle->GetColorPalette(Int_t(4./max2*numcol + 1.)));
       tt3->SetTextAlign(12);
-      TText *tt4 = pave2->AddText(Form("High Gain Signals Oscillation:               %3i pixels",
-                                       CountBadPixels(&disp25,4)));
-      tt4->SetTextColor(gStyle->GetColorPalette(Int_t(4./max2*numcol + 1.)));
+      TText *tt4 = pave2->AddText(Form("High Gain Signals Oscillation:                %3i pixels",
+                                       CountBadPixels(&disp25,5)));
+      tt4->SetTextColor(gStyle->GetColorPalette(Int_t(5./max2*numcol + 1.)));
       tt4->SetTextAlign(12);
       TText *tt5 = pave2->AddText(Form("Low  Gain Signals Oscillation:                %3i pixels",
-                                       CountBadPixels(&disp25,5)));
-      tt5->SetTextColor(gStyle->GetColorPalette(Int_t(5./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,6)));
+      tt5->SetTextColor(gStyle->GetColorPalette(Int_t(6./max2*numcol + 1.)));
       tt5->SetTextAlign(12); 
       TText *tt6 = pave2->AddText(Form("Relative Arr. Times Oscillation:              %3i pixels",
-                                       CountBadPixels(&disp25,6)));
-      tt6->SetTextColor(gStyle->GetColorPalette(Int_t(6./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,7)));
+      tt6->SetTextColor(gStyle->GetColorPalette(Int_t(7./max2*numcol + 1.)));
       tt6->SetTextAlign(12);
       pave2->Draw();