Changeset 5135 for trunk/MagicSoft/Mars/mjobs

Timestamp:

09/25/04 13:51:15 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (7 diffs)
• MJCalibration.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -167 +167 @@
 const Int_t MJCalibration::gkIFAEBoxInaugurationRun       = 20113;
 const Int_t MJCalibration::gkSecondBlindPixelInstallation = 31693;
-const Int_t MJCalibration::gkThirdBlindPixelInstallation  = 99999;
+const Int_t MJCalibration::gkSpecialPixelsContInstallation = 34057;
+const Int_t MJCalibration::gkThirdBlindPixelInstallation   = 99999;
 
 const Double_t MJCalibration::fgConvFADC2PheMin           = 0.;
@@ -321 +322 @@
     MCalibrationQECam      *qecam  = NULL;
     MCalibrationRelTimeCam *relcam = NULL;
+    MBadPixelsCam          *badcam = NULL;
 
     if (IsIntensity())
@@ -327 +329 @@
         qecam  = (MCalibrationQECam*)     fIntensQECam.GetCam();
         relcam = (MCalibrationRelTimeCam*)fIntensRelTimeCam.GetCam();
+        badcam = (MBadPixelsCam*)         fIntensBadCam.GetCam();
       }
     else
@@ -333 +336 @@
         qecam  = &fQECam;
         relcam = &fRelTimeCam;
+        badcam = &fBadPixels;
       }
     
@@ -386 +390 @@
     // Pixels with defects
     disp23.SetCamContent(*cam, 20);
-    disp24.SetCamContent(fBadPixels, 6);
-    disp25.SetCamContent(fBadPixels, 7);
+    disp24.SetCamContent(*badcam, 6);
+    disp25.SetCamContent(*badcam, 7);
 
     // Oscillations
-    disp26.SetCamContent(fBadPixels, 10);
-    disp27.SetCamContent(fBadPixels, 11);
+    disp26.SetCamContent(*badcam, 10);
+    disp27.SetCamContent(*badcam, 11);
 
     // Arrival Times
@@ -610 +614 @@
       // CONVERSION FACTORS
       // 
-
       TCanvas &c2 = fDisplay->AddTab("Conversion");
       c2.Divide(3,3);
@@ -1386 +1389 @@
   else if (run < gkThirdBlindPixelInstallation)
     {
+
       MCalibrationBlindCamTwoNewStyle blindresults;
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -58 +58 @@
   static const Int_t gkIFAEBoxInaugurationRun;          //! Run number of first IFAE box calibration
   static const Int_t gkSecondBlindPixelInstallation;    //! Run number upon which second blind pixel was installed
-  static const Int_t gkThirdBlindPixelInstallation;     //! Run number upon which third blind pixel was installed
+  static const Int_t gkSpecialPixelsContInstallation;   //! Run number upon which third blind pixel was installed
+  static const Int_t gkThirdBlindPixelInstallation;     //! Run number upon which third blind pixel was installed  
 
   static const Double_t fgConvFADC2PheMin;              //! Histogram minimum for conversion factor to phes