Changeset 4670 for trunk/MagicSoft/Mars/mjobs

Timestamp:

08/17/04 23:38:13 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -119 +119 @@
 #include "MCalibrationChargeBlindPix.h"
 #include "MCalibrationChargeBlindCam.h"
-#include "MCalibrationChargeBlindPix.h"
+#include "MCalibrationChargeBlindCamOneOldStyle.h"
+#include "MCalibrationChargeBlindCamTwoNewStyle.h"
 #include "MCalibrationChargeCalc.h"
 
@@ -1439 +1440 @@
   if (run < gkSecondBlindPixelInstallation)
     {
-      blindext.SetModified(kFALSE);
+
+      MCalibrationChargeBlindCamOneOldStyle blindresults;
+      blindresults.Copy(fCalibrationBlindCam);
+
       blindext.SetExtractionType(MExtractBlindPixel::kIntegral);
       blindext.SetExtractionType(MExtractBlindPixel::kFilter);
@@ -1446 +1450 @@
       blindcam.SetFitFunc( MHCalibrationChargeBlindPix::kEPoisson5 );
     }
-  else
-    {
-      blindext.SetModified(kTRUE);
+  else if (run < gkThirdBlindPixelInstallation)
+    {
+
+      MCalibrationChargeBlindCamTwoNewStyle blindresults;
+      blindresults.Copy(fCalibrationBlindCam);
+
+      blindext.SetNumBlindPixels(blindresults.GetNumBlindPixels());
+      for (UInt_t i=0;i<blindresults.GetNumBlindPixels();i++)
+        blindext.SetBlindPixelIdx(blindresults[i].GetPixId(),i);
+
       blindext.SetExtractionType(MExtractBlindPixel::kAmplitude);
       blindext.SetExtractionType(MExtractBlindPixel::kFilter);
@@ -1454 +1465 @@
       blindext.SetNSBFilterLimit(38);
       
-      if (run < gkThirdBlindPixelInstallation)
-        blindext.SetNumBlindPixels(2);
-      else
-        blindext.SetNumBlindPixels(3);
-    }
+    }
+  else
+    {
+      *fLog << err << "Third blind pixel installation not yet completed, check your run number!!! " << endl;
+    }
+  
 }
 
@@ -1568 +1580 @@
     MExtractPINDiode         pinext;
     MExtractBlindPixel       blindext;
+
     InitBlindPixel(blindext, blindcam);
+
     MExtractSlidingWindow    extract2;
     MExtractTimeFastSpline   timespline;