Changeset 4296 for trunk/MagicSoft/Mars/mcalib

Timestamp:

06/16/04 10:39:19 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MMcCalibrationCalc.cc (modified) (7 diffs)
• MMcCalibrationCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

@@ -28 +28 @@
 //
 //  Input Containers:
+//   MMcConfigRunHeader
 //   MRawRunHeader
 //   MMcFadcHeader
@@ -57 +58 @@
 #include "MGeomCam.h"
 #include "MRawRunHeader.h"
+#include "MMcConfigRunHeader.h"
 
 #include "MHillas.h"
@@ -194 +196 @@
   }
 
+  // Now check the light collection for inner and outer pixels to
+  // calculate the ratio between the two. FIXME! Light collection
+  // depends on the incidence angle of the light w.r.t. the camera
+  // plane. For the moment we take the ratio for light impinging
+  // perpendicular to the camera plane.
+  //
+  // FIXME! We should look for AddSerialNumber("MMcConfigRunHeader") but
+  // for the moment the stereo version of camera does not write one such
+  // header per telescope (it should!)
+  //
+  MMcConfigRunHeader* mcconfig = (MMcConfigRunHeader*) pList->FindObject("MMcConfigRunHeader");
+  if (!mcconfig)
+    {
+      *fLog << err << "MMcConfigRunHeader" << " not found... aborting." << endl;
+      return kFALSE;
+    }
+  TArrayF innerlightcoll = mcconfig->GetLightCollectionFactor();
+  TArrayF outerlightcoll = mcconfig->GetLightCollectionFactorOuter();
+
+  // In principle outer pixels seem to have a different average light 
+  // collection efficiency than outer ones. We set here the factor between
+  // the two.
+
+  fOuterPixelsLightCollection = outerlightcoll[90] / innerlightcoll[90]; 
+  // (at angle = 90 deg)
+
+
   return kTRUE;
 }
@@ -210 +239 @@
         return kTRUE;
 
+    const Float_t size = fHillas->GetSize(); 
+    const Float_t innersize = fNew->GetInnerSize();
+
+    // Size will at this point be in ADC counts (still uncalibrated)
     //
     // Exclude events with low Size (larger fluctuations)
@@ -216 +249 @@
     //   
 
-    const Float_t size = fHillas->GetSize(); 
-    // Size will at this point be in ADC counts (still uncalibrated)
-
     if (size < 1000)
         return kTRUE;
 
-    fHistADC2PhotEl->Fill(TMath::Log10(fMcEvt->GetPhotElfromShower()/size));
-    fHistPhot2PhotEl->Fill( (Float_t) fMcEvt->GetPhotElfromShower() /
-                        (Float_t) fMcEvt->GetPassPhotCone() );
+    //
+    // PATCH: Convert number of photoelectrons in camera to the approximate number 
+    // of photoelectrons that would have been registered if all pixels had the same
+    // light collection efficiency as inner ones (called here "corrected_photel").
+    //
+ 
+    const Float_t inner_photel = (Float_t) fMcEvt->GetPhotElfromShower() * innersize / size;
+    const Float_t outer_photel = (Float_t) fMcEvt->GetPhotElfromShower() - inner_photel;
+
+    const Float_t corrected_photel = inner_photel + outer_photel / fOuterPixelsLightCollection;
+
+
+    //    fHistADC2PhotEl->Fill(TMath::Log10(fMcEvt->GetPhotElfromShower()/size));
+
+    fHistADC2PhotEl->Fill(TMath::Log10(corrected_photel/size));
+    fHistPhot2PhotEl->Fill( corrected_photel / (Float_t) fMcEvt->GetPassPhotCone() );
 
     return kTRUE;
@@ -270 +313 @@
         MCalibrationQEPix     &qepix  = (MCalibrationQEPix&)    (*fQECam) [i];
 
-        qepix.SetAverageQE(fPhot2PhotEl);
+        Float_t qe = fPhot2PhotEl;
+        if (fGeom->GetPixRatio(i) < 1.)
+          qe *= fOuterPixelsLightCollection;
+        qepix.SetAverageQE(qe);
 
         qepix.SetAvNormFFactor(1.);
@@ -284 +330 @@
         //
         // We take into account the (possibly) different gain of outer pixels:
+        // FIXME: we are now assuming that all inner pixels have the same gain, and all 
+        // outer pixels have the same gain (different from inner ones though). This can 
+        // only be like this in camera 0.7, but may change in future versions of camera.
         //
+
         if (fGeom->GetPixRatio(i) < 1.)
           factor *= fHeaderFadc->GetAmplitud()/fHeaderFadc->GetAmplitudOuter();

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.h

@@ -27 +27 @@
     MMcFadcHeader             *fHeaderFadc;
 
-    Float_t fADC2PhotEl;   // Conversion factor (photel / ADC count)
-    Float_t fPhot2PhotEl;  // Conversion factor (photons / photoelectron) = average QE
+    Float_t fADC2PhotEl;   // Conversion factor (photel / ADC count). FOR INER PIXELS
+    Float_t fPhot2PhotEl;  // Conversion factor (photons / photoelectron) = average QE. FOR INER PIXELS
     Long_t  fEvents;
+    Float_t fOuterPixelsLightCollection; // Light collection efficiency (plexiglas, light guide) of 
+                                         // outer pixels w.r.t inner ones
 
     TH1F*   fHistADC2PhotEl;