Changeset 3297 for trunk/MagicSoft/Mars

Timestamp:

02/25/04 07:55:57 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mcalib/CalibLinkDef.h (modified) (1 diff)
• mcalib/MCalibrationBlindPix.cc (deleted)
• mcalib/MCalibrationBlindPix.h (deleted)
• mcalib/MHCalibrationBlindPixel.cc (deleted)
• mcalib/MHCalibrationBlindPixel.h (deleted)
• mcalib/MHCalibrationChargeBlindPix.cc (modified) (1 diff)
• mcalib/MHCalibrationConfig.h (deleted)
• mcalib/MHCalibrationPINDiode.cc (deleted)
• mcalib/MHCalibrationPINDiode.h (deleted)
• mjobs/MJCalibration.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

@@ -14 +14 @@
 #pragma link C++ class MCalibrationChargePINDiode+;
 
-#pragma link C++ class MHCalibrationChargeBlindPix+;
 #pragma link C++ class MHCalibrationChargeBlindPix+;
 #pragma link C++ class MHCalibrationChargePix+;

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc

@@ -827 +827 @@
   fHPedestalFADCSlices = new TH1F(fAPedestalFADCSlices);
   fHPedestalFADCSlices->SetName("PedestalFADCSlices");
-  fHPedestalFADCSlices->SetTitle(Form("%s%f","Assumed Single Phe FADC Slices, Sum > ",fSinglePheCut));
+  fHPedestalFADCSlices->SetTitle(Form("%s%f","Pedestal FADC Slices, Sum > ",fSinglePheCut));
   fHPedestalFADCSlices->SetXTitle("FADC slice number");
   fHPedestalFADCSlices->SetYTitle("FADC counts");

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -49 +49 @@
 #include "MCalibrationChargeCam.h"
 #include "MCalibrationChargePINDiode.h"
+#include "MCalibrationChargeBlindPix.h"
+#include "MCalibrationChargeCalc.h"
 
 #include "MReadMarsFile.h"
@@ -57 +59 @@
 #include "MExtractBlindPixel.h"
 #include "MExtractSignal2.h"
-#include "MCalibrationChargeCalc.h"
 #include "MFCosmics.h"
 #include "MContinue.h"
@@ -477 +478 @@
     static_cast<MRead&>(read).AddFiles(*fRuns);
 
-    MCalibrationChargePINDiode pindiode;
-    pindiode.SetColor(MCalibrationChargePINDiode::kECT1);
-
     //
     // As long, as we don't have digital modules, 
     // we have to set the color of the pulser LED by hand
     //
-    fCalibrationCam.SetColor(MCalibrationChargeCam::kECT1);
+    MCalibrationChargePINDiode pindiode;
+    pindiode.SetColor(MCalibrationChargePINDiode::kECT1);
+
+    MCalibrationChargeBlindPix blindpix;
+    blindpix.SetColor(MCalibrationChargeBlindPix::kECT1);
 
     // Setup Tasklist
@@ -491 +493 @@
     plist.AddToList(&fCalibrationCam);
     plist.AddToList(&pindiode);
+    plist.AddToList(&blindpix);
 
     MTaskList tlist;
@@ -504 +507 @@
 
     MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
+    MFillH fillblind("MHCalibrationChargeBlindPix", "MExtractedSignalBlindPixel");
     // 
     // Apply a filter against cosmics
@@ -522 +526 @@
     tlist.AddToList(&cont);
     tlist.AddToList(&fillpin);
+    tlist.AddToList(&fillblind);
     tlist.AddToList(&calcalc);