Changeset 3768 for trunk/MagicSoft/Mars/macros

Timestamp:

04/16/04 19:17:36 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/macros

Files:

• mccalibrate.C (modified) (5 diffs)
• starmc.C (modified) (4 diffs)

trunk/MagicSoft/Mars/macros/mccalibrate.C

@@ -46 +46 @@
   // ------------- user change -----------------
   TString* CalibrationFilename;
-  CalibrationFilename = new TString("nonoise/Gamma_zbin0_0*.root");
+  CalibrationFilename = new TString("../../gammas_nonoise/Gamma_zbin0_0*.root");
   // File to be used for the calibration (must be a camera file without added noise)
 
@@ -54 +54 @@
 
 
-  Int_t BinsHigh[2] = {5, 9}; // First and last FADC bin of the range to be integrated,
-  Int_t BinsLow[2]  = {5, 9}; // for high and low gain respectively.
+  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.
 
   // -------------------------------------------
@@ -95 +95 @@
 
   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]);
@@ -101 +103 @@
 
   MCalibrate calib; // Transforms signals from ADC counts into photons.
-  calib.SetCalibrationMode(MCalibrate::kDummy);
+  calib.SetCalibrationMode(MCalibrate::kFfactor);
 
   //    MBlindPixelCalc   blind;
@@ -170 +172 @@
     }
 
-  calib.SetCalibrationMode(MCalibrate::kFfactor);
-
   //
   // Second loop: analysis loop

trunk/MagicSoft/Mars/macros/starmc.C

@@ -52 +52 @@
   // differences in gain of outer pixels)
   //
-  CalibrationFilename = new TString("nonoise/Gamma_zbin0_90_*.root");
+  CalibrationFilename = new TString("../../gammas_nonoise/Gamma_zbin0_90_*.root");
   // File to be used in the calibration (must be a camera file without added noise)
 
   Char_t* AnalysisFilename = "Gamma_zbin*.root";  // File to be analyzed
+
 
   // ------------- user change -----------------
@@ -73 +74 @@
   Float_t CleanLev[2] = {4., 3.}; // Tail cuts for image analysis
 
-  Int_t BinsHigh[2] = {5, 9}; // First and last FADC bin of the range to be integrated,
-  Int_t BinsLow[2]  = {5, 9}; // for high and low gain respectively.
+  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.
 
   // -------------------------------------------
@@ -114 +115 @@
 
   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]);
@@ -120 +122 @@
 
   MCalibrate calib; // Transforms signals from ADC counts into photons.
+  calib.SetCalibrationMode(MCalibrate::kFfactor);
 
   //    MBlindPixelCalc   blind;