Changeset 5391 for trunk

Timestamp:

11/11/04 14:56:57 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mjobs/MJCalibration.cc (modified) (5 diffs)
• msignal/MExtractBlindPixel.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -129 +129 @@
 #include "MCalibrationBlindCamOneOldStyle.h"
 #include "MCalibrationBlindCamTwoNewStyle.h"
+#include "MCalibrationBlindCamThreeNewStyle.h"
 #include "MCalibrationChargeCalc.h"
 #include "MCalibColorSet.h"
@@ -165 +166 @@
 using namespace std;
 
-const Int_t MJCalibration::gkIFAEBoxInaugurationRun       = 20113;
-const Int_t MJCalibration::gkSecondBlindPixelInstallation = 31693;
+const Int_t MJCalibration::gkIFAEBoxInaugurationRun        = 20113;
+const Int_t MJCalibration::gkSecondBlindPixelInstallation  = 31693;
 const Int_t MJCalibration::gkSpecialPixelsContInstallation = 34057;
-const Int_t MJCalibration::gkThirdBlindPixelInstallation   = 99999;
+const Int_t MJCalibration::gkThirdBlindPixelInstallation   = 43308;
 
 const Double_t MJCalibration::fgConvFADC2PheMin           = 0.;
@@ -283 +284 @@
 
     if (IsUsePINDiode())
-        DrawTab(plist, "MHCalibrationChargePINDiode",       "PINDiode",  drawoption);
+        DrawTab(plist, "MHCalibrationChargePINDiode", "PINDiode",  drawoption);
     if (IsUseBlindPixel())
-        DrawTab(plist, "MHCalibrationChargeChargeBlindCam", "BlindPix",  drawoption);
+        DrawTab(plist, "MHCalibrationChargeBlindCam", "BlindPix",  drawoption);
     if (IsRelTimes())
-        DrawTab(plist, "MHCalibrationRelTimeCam",           "RelTime",   drawoption);
-    DrawTab(plist, "MHCalibrationChargeCam",                "Charge",    drawoption);
+        DrawTab(plist, "MHCalibrationRelTimeCam",     "RelTime",   drawoption);
+    DrawTab(plist, "MHCalibrationChargeCam",          "Charge",    drawoption);
 
     //
@@ -1431 +1432 @@
   else
     {
-      *fLog << err << "Third blind pixel installation not yet completed, check your run number!!! " << endl;
+
+      MCalibrationBlindCamThreeNewStyle blindresults;
+
+      if (IsIntensity())
+        blindresults.Copy(*fIntensBlindCam.GetCam());
+      else
+        blindresults.Copy(fCalibrationBlindCam);
+
+      blindext.SetNumBlindPixels(blindresults.GetSize());
+
+      for (Int_t i=0;i<blindresults.GetSize();i++)
+        blindext.SetBlindPixelIdx(blindresults[i].GetPixId(),i);
+
+      blindext.SetExtractionType(MExtractBlindPixel::kAmplitude);
+      blindext.SetExtractionType(MExtractBlindPixel::kFilter);
+      blindext.SetDataType(MExtractBlindPixel::kRawEvt2);
+      blindext.SetRange(5,8,0,2);
+      blindext.SetNSBFilterLimit(38);
+      
     }
   
@@ -1677 +1696 @@
     // 
     if (fColor == MCalibrationCam::kCT1)
-        tlist.AddToList(&cont);
+      tlist.AddToList(&cont);
 
     MCalibColorSet colorset;

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -102 +102 @@
   
   AddToBranchList("MRawEvtData.*");
+  AddToBranchList("MRawEvtData2.*");
 
   SetResolution();
@@ -221 +222 @@
   if (!fRawEvt)
     {
-      *fLog << err << "MRawEvtData2 or MRawEvtData not found... aborting." << endl;
+      *fLog << err << GetDescriptor() 
+            << Form("%s%s",IsDataType(kRawEvt2) ? "MRawEvtData2" : "MRawEvtData",
+                    " not found... aborting.") << endl;
       return kFALSE;
     }