Changeset 3298 for trunk/MagicSoft/Mars

Timestamp:

02/25/04 08:05:18 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• macros/pedphotcalc.C (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
  2004/02/24: Markus Gaug
 
+   * mjobs/MJCalibration.cc
+   * macros/calibration.C
+   * macros/bootcampstandardanalysis.C
+   * macros/pedphotcalc.C
+     - added MCalibrationChargeBlindPix to plist
+     - added new filling of histograms with MFillH
+     - changed SetPulserColor to MCalibrationChargeBlindPix and 
+       MCalibrationChargePINDiode
+
    * mcalib/MHCalibrationChargeBlindPix.[h,cc]
 
@@ -27 +36 @@
      Finalize function
    - is filled via MFillH from MExtractBlindPixel
+   - SetPulserColor directly in this class
 
    * mcalib/MCalibrationChargeBlindPix.[h,cc]
@@ -47 +57 @@
    * mcalib/MCalibrationChargePINDiode.[h,cc]
      - added function SetFluxOutsidePlexiglassAvailable
+     - SetPulserColor directly in this class
+
+   * mcalib/MCalibrationChargeCam.cc
+     - removed function SetPulserColor from here 
+
+
+   * mcalib/MCalibrationPINDiode.[h,cc]
+   * mcalib/MHCalibrationPINDiode.[h,cc]
+   * mcalib/MCalibrationBlindPix.[h,cc]
+   * mcalib/MHCalibrationBlindPixel.[h,cc]
+   * mcalib/MHCalibrationConfig.h
+     - removed since obsolote 
 
    * mcalib/MHCalibrationChargePix.cc

trunk/MagicSoft/Mars/macros/pedphotcalc.C

@@ -38 +38 @@
 #include "MCalibrationChargePINDiode.h"
 #include "MHCalibrationChargePINDiode.h"
+#include "MCalibrationChargeBlindPix.h"
+#include "MHCalibrationChargeBlindPix.h"
 #include "MCalibrationChargeCalc.h"
 #include "MExtractedSignalCam.h"
@@ -119 +121 @@
   MExtractedSignalCam   sigcam;
 
-  MHCalibrationChargeCam  chargecam;
-  MHCalibrationChargePINDiode chargepin;
-  calcam.SetColor(MCalibrationChargeCam::kECT1);
-  pindiode.SetColor(MCalibrationChargePINDiode::kECT1);
+  MCalibrationChargeCam        chargecam;
+  MCalibrationChargePINDiode   chargepin;
+  MCalibrationChargeBlindPixel chargeblind;
+  chargeblind.SetColor(MCalibrationChargeBlindPix::kECT1);
+  chargepin.SetColor(  MCalibrationChargePINDiode::kECT1);
   //
   plist2.AddToList(&geomcam);
@@ -130 +133 @@
   plist2.AddToList(&chargecam);
   plist2.AddToList(&chargepin);  
+  plist2.AddToList(&chargeblind);  
 
   //tasks
@@ -140 +144 @@
   MCalibrationChargeCalc calcalc;
   
-  MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
-  MFillH fillcam("MHCalibrationChargeCam"     , "MExtractedSignalCam");
+  MFillH fillpin("MHCalibrationChargePINDiode",     "MExtractedSignalPINDiode");
+  MFillH fillblind("MHCalibrationChargeBlindPixel", "MExtractedSignalBlindPixel");
+  MFillH fillcam("MHCalibrationChargeCam"     ,     "MExtractedSignalCam");
   // 
   // Apply a filter against cosmics
@@ -161 +166 @@
   //
   tlist2.AddToList(&fillpin);
+  tlist2.AddToList(&fillblind);
   tlist2.AddToList(&fillcam);
   tlist2.AddToList(&calcalc);