Changeset 7005 for trunk/MagicSoft/Mars/manalysis

Timestamp:

05/10/05 12:13:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MMcCalibrationUpdate.cc (modified) (4 diffs)
• MMcCalibrationUpdate.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -79 +79 @@
 
 MMcCalibrationUpdate::MMcCalibrationUpdate(const char *name, const char *title)
+  :  fFillCalibrationCam(kTRUE), fOuterPixelsGainScaling(kTRUE), fAmplitude(-1.), 
+     fAmplitudeOuter(-1.), fConversionHiLo(-1.), fUserLow2HiGainFactor(-1.), 
+     fSignalType(MCalibrateData::kPhe)
 {
     fName  = name  ? name  : "MMcCalibrationUpdate";
     fTitle = title ? title : "Write MC pedestals and conversion factors into MCalibration Container";
-
-
-    fAmplitude = -1.;
-    fAmplitudeOuter = -1.;
-    fConversionHiLo = -1.;
-
-    fSignalType = MCalibrateData::kPhot;
-
-    fFillCalibrationCam = kTRUE;
-    fOuterPixelsGainScaling = kTRUE;
 }
 
@@ -194 +187 @@
           {
             fAmplitudeOuter = fHeaderFadc->GetAmplitudOuter();
-            fConversionHiLo = fHeaderFadc->GetLow2HighGain();
+
+            fHeaderLow2HiGainFactor = fHeaderFadc->GetLow2HighGain();
+
+            // The high to low gain ratio is stored in MMcFadcHeader.Low2HighGain. 
+            // However, this is just the ratio of total pulse integrals. Since the 
+            // shape of the low gain pulse is different from that of the high gain,
+            // the factor to be applied to signals extracted from low gain depends
+            // on the type of signal extractor (for instance if we extract the pulse 
+            // height, the factor is larger than Low2HighGain, because the low gain
+            // pulse shape is wider and hence lower than the high gain pulse. So the 
+            // user can set manually the value of the factor to be applied. If such 
+            // value has not been set by the user, then we takes as default Low2HighGain.
+
+            if (fUserLow2HiGainFactor < 0.)
+              fConversionHiLo = fHeaderLow2HiGainFactor;
+            else
+              fConversionHiLo = fUserLow2HiGainFactor;
+
           }
         else // old MC files, camera  < v0.7
@@ -203 +213 @@
 
     }
-    else   // Check that following files have all the same FADC parameters
+    else   // Check that the following files have all the same FADC parameters as the first
     {
       if ( fabs(fHeaderFadc->GetAmplitud()-fAmplitude) > 1.e-6 )
@@ -211 +221 @@
         }
 
-      if (mcrunh->GetCamVersion() > 60) // old MC files, camera < v0.7
+      if (mcrunh->GetCamVersion() > 60) // files from camera 0.7 or newer
         {
           if( fabs(fHeaderFadc->GetAmplitudOuter()-fAmplitudeOuter) > 1.e-6  ||
-              fabs(fConversionHiLo-fHeaderFadc->GetLow2HighGain())  > 1.e-6 )
+              fabs(fHeaderLow2HiGainFactor-fHeaderFadc->GetLow2HighGain()) > 1.e-6 )
             {
               *fLog << err << "Parameters of MMcFadcHeader are not the same for all files... aborting." << endl;

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h

@@ -42 +42 @@
     Float_t fAmplitude;      // FADC parameters from camera simulation (see camera manual)
     Float_t fAmplitudeOuter; // to be read from the MMcFadcHeader.
-    Float_t fConversionHiLo; // Ratio of high to low gain.
+    Float_t fConversionHiLo; // Ratio of high to low gain to be used for low gain signal calibration.
+
+    Float_t fHeaderLow2HiGainFactor; // Ratio of high to low gain, as read from the MMcFadcHeader
+    Float_t fUserLow2HiGainFactor;   // Ratio of high to low gain, as set manually by the user
+
 
     Float_t fOuterPixelsLightCollection; 
@@ -58 +62 @@
       { fOuterPixelsGainScaling = tf; }
 
+    void SetUserLow2HiGainFactor(Float_t x) { fUserLow2HiGainFactor = x; }
+
     void SetSignalType (MCalibrateData::SignalType_t x) { fSignalType = x; }
     MCalibrateData::SignalType_t GetSignalType () const { return fSignalType; }