Changeset 4987 for trunk

Timestamp:

09/14/04 00:20:44 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (11 diffs)
• MJCalibration.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -63 +63 @@
 //           MHCalibrationChargeBlindPix, MHCalibrationChargePINDiode
 //           MCalibrationChargePix, MCalibrationChargeCam, MCalibrationChargeCalc
-//           MCalibrationChargeBlindPix, MCalibrationChargePINDiode,
+//           MCalibrationBlindPix, MCalibrationChargePINDiode,
 //           MCalibrationQECam, MBadPixelsPix, MBadPixelsCam
 //
@@ -88 +88 @@
 
 #include <TFile.h>
+#include <TF1.h>
 #include <TStyle.h>
 #include <TCanvas.h>
@@ -114 +115 @@
 
 #include "MCalibrationIntensityChargeCam.h"
+#include "MCalibrationIntensityBlindCam.h"
 #include "MCalibrationIntensityRelTimeCam.h"
 #include "MCalibrationIntensityQECam.h"
@@ -123 +125 @@
 #include "MCalibrationChargePix.h"
 #include "MCalibrationChargePINDiode.h"
-#include "MCalibrationChargeBlindPix.h"
-#include "MCalibrationChargeBlindCam.h"
-#include "MCalibrationChargeBlindCamOneOldStyle.h"
-#include "MCalibrationChargeBlindCamTwoNewStyle.h"
+#include "MCalibrationBlindPix.h"
+#include "MCalibrationBlindCam.h"
+#include "MCalibrationBlindCamOneOldStyle.h"
+#include "MCalibrationBlindCamTwoNewStyle.h"
 #include "MCalibrationChargeCalc.h"
 #include "MCalibColorSet.h"
@@ -1428 +1430 @@
     {
 
-      MCalibrationChargeBlindCamOneOldStyle blindresults;
+      MCalibrationBlindCamOneOldStyle blindresults;
       blindresults.Copy(fCalibrationBlindCam);
 
@@ -1435 +1437 @@
       blindext.SetRange(10,19,0,6);
       blindext.SetNSBFilterLimit(70);
-      blindcam.SetFitFunc( MHCalibrationChargeBlindPix::kEPoisson5 );
     }
   else if (run < gkThirdBlindPixelInstallation)
     {
 
-      MCalibrationChargeBlindCamTwoNewStyle blindresults;
+      MCalibrationBlindCamTwoNewStyle blindresults;
       blindresults.Copy(fCalibrationBlindCam);
 
-      blindext.SetNumBlindPixels(blindresults.GetNumBlindPixels());
-      for (UInt_t i=0;i<blindresults.GetNumBlindPixels();i++)
+      blindext.SetNumBlindPixels(blindresults.GetSize());
+      for (Int_t i=0;i<blindresults.GetSize();i++)
         blindext.SetBlindPixelIdx(blindresults[i].GetPixId(),i);
 
@@ -1475 +1476 @@
 //   5) MBadPixelsCam         (fBadPixels)
 //   6) MCalibrationChargePINDiode
-//   7) MCalibrationChargeBlindPix
+//   7) MCalibrationBlindPix
 // - Put into the MTaskList:
 //   1)  MReadMarsFile
@@ -1574 +1575 @@
         plist.AddToList(&fIntensQECam);
         plist.AddToList(&fIntensCalibCam);
-        //        plist.AddToList(&fIntensCalibrationBlindCam);
+        plist.AddToList(&fIntensBlindCam);
         //        plist.AddToList(&fIntensCalibrationPINDiode);
         plist.AddToList(&fIntensRelTimeCam);
@@ -1931 +1932 @@
 // The following containers are written:
 // - MStatusDisplay
-// - MCalibrationChargeCam
-// - MCalibrationChargeBlindPix
-// - MCalibrationQECam
+// - MCalibrationChargeCam or MCalibrationIntensityChargeCam 
+// - MCalibrationBlindCam  or MCalibrationIntensityBlindCam
+// - MCalibrationQECam     or MCalibrationIntensityQECam     
 // - MBadPixelsCam
 //
@@ -1974 +1975 @@
           {
             *fLog << err << "Unable to write MCalibrationIntensityQECam to " << oname << endl;
+            return kFALSE;
+          }
+        *fLog << inf << "ok." << endl;
+        *fLog << inf << " - MCalibrationIntensityBlindCam..." << flush;
+        if (fIntensBlindCam.Write()<=0)
+          {
+            *fLog << err << "Unable to write MCalibrationIntensityBlindCam to " << oname << endl;
             return kFALSE;
           }
@@ -1995 +2003 @@
           }
         *fLog << inf << "ok." << endl;
+
+        *fLog << inf << " - MCalibrationBlindCam..." << flush;
+        if (fCalibrationBlindCam.Write()<=0)
+          {
+            *fLog << err << "Unable to write MCalibrationBlindCam to " << oname << endl;
+            return kFALSE;
+          }
+        *fLog << inf << "ok." << endl;
       }
-    
-    *fLog << inf << " - MCalibrationChargeBlindCam..." << flush;
-    if (fCalibrationBlindCam.Write()<=0)
-      {
-        *fLog << err << "Unable to write MCalibrationChargeBlindCam to " << oname << endl;
-        return kFALSE;
-      }
-    *fLog << inf << "ok." << endl;
     
     *fLog << inf << " - MCalibrationChargePINDiode..." << flush;

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -11 +11 @@
 #include "MCalibrationChargeCam.h"
 #endif
-#ifndef MARS_MCalibrationChargeBlindCam
-#include "MCalibrationChargeBlindCam.h"
+#ifndef MARS_MCalibrationIntensityBlindCam
+#include "MCalibrationIntensityBlindCam.h"
+#endif
+#ifndef MARS_MCalibrationBlindCam
+#include "MCalibrationBlindCam.h"
 #endif
 #ifndef MARS_MCalibrationChargePINDiode
@@ -82 +85 @@
   MCalibrationIntensityChargeCam  fIntensCalibCam;      // Calibration conversion factors FADC2Phe for diff. intens.
   MCalibrationChargeCam           fCalibrationCam;      // Calibration conversion factors FADC2Phe  
-  MCalibrationChargeBlindCam      fCalibrationBlindCam; // Calibration from Blind Pixel(s)
+  MCalibrationIntensityBlindCam   fIntensBlindCam;      // Calibration from Blind Pixel(s)
+  MCalibrationBlindCam            fCalibrationBlindCam; // Calibration from Blind Pixel(s)  
   MCalibrationChargePINDiode      fCalibrationPINDiode; // Calibration from PIN Diode
   MCalibrationIntensityQECam      fIntensQECam;         // Quantum efficiency for diff. intensities,