Changeset 6342

Timestamp:

02/10/05 10:51:54 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/starmc.C (modified) (3 diffs)
• manalysis/MMcCalibrationUpdate.cc (modified) (1 diff)
• manalysis/MMcCalibrationUpdate.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/02/10 Abelardo Moralejo
+
+   * macros/starmc.C
+     - Cleaned up a little bit, made the option to choose between 
+       calibration in photons or phe- easier to set.
+
+   * manalysis/MMcCalibrationUpdate.[h,cc]
+     - Added getter and setter for fSignalType. Set fSignalType=kPhot as
+       default for consistency with MCalibrateData.
 
  2005/02/10 Markus Gaug 

trunk/MagicSoft/Mars/macros/starmc.C

@@ -53 +53 @@
   //
   CalibrationFilename = new TString("/users/emc/moralejo/mcdata/Period021_0.73_mirror/gammas_nonoise/Gamma_zbin0_*.root");
-
   // File to be used in the calibration (must be a camera file without added noise)
 
+
   Char_t* AnalysisFilename = "Gamma_*w0.root";  // File to be analyzed
-  //  Char_t* AnalysisFilename = "Gamma_*1000to1009*w0.root";  // File to be analyzed
+
 
 
@@ -74 +74 @@
   Float_t accepted_fraction = 1.;
 
-  Float_t CleanLev[2] = {5.75, 3.84}; // Tail cuts for image analysis
+  Float_t CleanLev[2] = {5.75, 3.84}; 
+  // User change: tail cuts for image analysis
+
   MImgCleanStd  clean(CleanLev[0], CleanLev[1]); // Applies tail cuts to image.
-  //  clean.SetMethod(MImgCleanStd::kScaled);
-
-  //  Int_t BinsHigh[2] = {5, 10}; // First and last FADC bin of the range to be integrated,
-  //  Int_t BinsLow[2]  = {5, 10}; // for high and low gain respectively.
-  //  MExtractSignal    sigextract;
-  //  sigextract.SetSaturationLimit(240);
-  // Define ADC slices to be integrated in high and low gain:
-  //  sigextract.SetRange(BinsHigh[0], BinsHigh[1], BinsLow[0], BinsLow[1]);
-
-//     MExtractFixedWindowPeakSearch sigextract;
-//     sigextract.SetWindows(6, 6, 4);
-
-   MExtractTimeAndChargeDigitalFilter sigextract;
-   sigextract.SetNameWeightsFile("/users/emc/moralejo/Mars/msignal/MC_weights.dat");
-   sigextract.SetNameWeightsFile("/users/emc/moralejo/Mars/msignal/cosmics_weights.dat");
-   sigextract.SetRange(1, 14, 3, 14);
+
+
+  //  User change: signal extraction
+  //
+  //  MExtractFixedWindowPeakSearch sigextract;
+  //  sigextract.SetWindows(6, 6, 4);
+
+  MExtractTimeAndChargeDigitalFilter sigextract;
+  sigextract.SetNameWeightsFile("/users/emc/moralejo/Mars/msignal/MC_weights.dat");
+  sigextract.SetRange(1, 14, 3, 14);
+
+  ////////// Calibration //////////
+
+  MMcCalibrationUpdate  mccalibupdate;
+  ///// User change: calibrate in photons or phe- :
+  mccalibupdate.SetSignalType(MCalibrateData::kPhe);
+  //  mccalibupdate.SetSignalType(MCalibrateData::kPhot);
+
 
   MSrcPosCam src;
   //
-  // WOBBLE MODE!!
+  // ONLY FOR WOBBLE MODE!!
   //   src.SetX(120.);  // units: mm
 
   src.SetReadyToSave();
-
 
   // -------------------------------------------
@@ -141 +144 @@
   // information taken from MMcEvt.
 
-  MMcCalibrationUpdate  mccalibupdate;
-
-  MCalibrateData calib; // Transforms signals from ADC counts into photons.
+  MCalibrateData calib; // Applies calibration to the data
   calib.SetCalibrationMode(MCalibrateData::kFfactor);
-  calib.SetSignalType(MCalibrateData::kPhe);
+  // Do not change the CalibrationMode above for MC...!
+  calib.SetSignalType(mccalibupdate.GetSignalType());
 
   //    MBlindPixelCalc   blind;

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -88 +88 @@
     fConversionHiLo = -1.;
 
-    fSignalType = MCalibrateData::kPhe;
+    fSignalType = MCalibrateData::kPhot;
 
     fFillCalibrationCam = kTRUE;

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h

@@ -58 +58 @@
       { fOuterPixelsGainScaling = tf; }
 
+    void SetSignalType (MCalibrateData::SignalType_t x) { fSignalType = x; }
+    MCalibrateData::SignalType_t GetSignalType () const { return fSignalType; }
+
     ClassDef(MMcCalibrationUpdate, 0)   // Task which obtains, for MC files, the pedestal mean and rms, and the calibration factor from ADC counts to photons. 
 };