Changeset 3768 for trunk/MagicSoft/Mars/mcalib

Timestamp:

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

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc

@@ -177 +177 @@
        fQEFFactorVar    ( MCalibrationCam::gkNumPulserColors ),  
        fQEPINDiode      ( MCalibrationCam::gkNumPulserColors ),    
-       fQEPINDiodeVar   ( MCalibrationCam::gkNumPulserColors ), 
+       fQEPINDiodeVar   ( MCalibrationCam::gkNumPulserColors ),
+       fAverageQE       ( gkDefaultAverageQE ), 
        fValidFlags      ( MCalibrationCam::gkNumPulserColors )
 {
@@ -368 +369 @@
 const Float_t MCalibrationQEPix::GetAverageQE( const Float_t zenith ) const 
 {
-  return gkDefaultAverageQE ; 
+  //  return gkDefaultAverageQE ;
+  return fAverageQE; 
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h

@@ -48 +48 @@
   Float_t fAvNormPINDiode;                   // Normalization w.r.t. default QE (PIN Diode Method)
   Float_t fAvNormPINDiodeVar;                // Variance norm. w.r.t. def. QE (PIN Diode Method)
-                                             
+  Float_t fAverageQE;                        // Average QE for Cascade spectrum (default 0.18)
+
   TArrayC fValidFlags;                       // Bit-field for valid flags, one array entry for each color
   Byte_t  fAvailableFlags;                   // Bit-field for available flags
@@ -62 +63 @@
   void  AddAveragePINDiodeQEs  ( const MCalibrationCam::PulserColor_t col, Float_t &wav, Float_t &sumw );
 
-  const Float_t GetAverageQE     ( const Float_t zenith=0. ) const;  
-  const Float_t GetAverageQERelVar( const Float_t zenith=0. ) const;
-  
   const Float_t GetAvNormBlindPixelRelVar()  const;
   const Float_t GetAvNormCombinedRelVar()  const;
@@ -81 +79 @@
   
   // Getters
+
+  const Float_t GetAverageQE     ( const Float_t zenith=0. ) const;  
+  const Float_t GetAverageQERelVar( const Float_t zenith=0. ) const;
+  
   Float_t GetDefaultQE                   ( const MCalibrationCam::PulserColor_t col ) const;
   Float_t GetDefaultQERelVar             ( const MCalibrationCam::PulserColor_t col ) const;  
@@ -122 +124 @@
 
   // Setters 
+  void SetAverageQE            ( const Float_t f )  { fAverageQE            = f; }
   void SetAvNormBlindPixel     ( const Float_t f )  { fAvNormBlindPixel     = f; }      
   void SetAvNormBlindPixelVar  ( const Float_t f )  { fAvNormBlindPixelVar  = f; }   

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

@@ -35 +35 @@
 //
 //  Output Containers:
+//  (containers mus exist already, they are filled with new values).
 //   MCalibrationChargeCam
+//   MCalibrationQECam  
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -69 +71 @@
 {
     fName  = name  ? name  : "MMcCalibrationCalc";
-    fTitle = title ? title : "Calculate and write conversion factors into MCalibrationCam Container";
-
-    fHistRatio = new TH1F(AddSerialNumber("HistRatio"), "log10(fPassPhotCone/fSize)", 1500, -3., 3.);
-    fHistRatio->SetXTitle("log_{10}(fPassPhotCone / fSize) [phot/ADC count]");
+    fTitle = title ? title : "Calculate and write conversion factors into MCalibrationChargeCam and MCalibrationQECam containers";
+
+    fHistRatio = new TH1F(AddSerialNumber("HistRatio"), "log10(fPhotElfromShower/fSize)", 1500, -3., 3.);
+    fHistRatio->SetXTitle("log_{10}(fPhotElfromShower / fSize) [photel/ADC count]");
 }
 
@@ -100 +102 @@
 {
     fHistRatio->Reset();
-    fADC2Phot = 0;
+    fADC2PhotEl = 0;
+    fPhot2PhotEl = 0;
 
     fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
@@ -204 +207 @@
     // FIXME? The present cut (1000 "inner-pixel-counts") is somehow
     // arbitrary. Might it be optimized?
-    //
-    if (fHillas->GetSize()<1000)
+    //   
+
+    const Float_t size = fHillas->GetSize(); 
+    // Size will at this point be in ADC counts (still uncalibrated)
+
+    if (size < 1000)
         return kTRUE;
 
-    fADC2Phot += fMcEvt->GetPassPhotCone()/fHillas->GetSize();
-
-    fHistRatio->Fill(TMath::Log10(fMcEvt->GetPassPhotCone()/fHillas->GetSize()));
+    fPhot2PhotEl += (Float_t) fMcEvt->GetPhotElfromShower() /
+      (Float_t) fMcEvt->GetPassPhotCone();
+
+    fHistRatio->Fill(TMath::Log10(fMcEvt->GetPhotElfromShower()/size));
 
     return kTRUE;
@@ -228 +236 @@
     }
 
-    fADC2Phot /= n;
-
-    //
-    // For the calibration we no longer use the mean,
-    // but the peak of the distribution:
+    fPhot2PhotEl /= n;   // Average quantum efficiency
+
+    //
+    // Find peak of log10(photel/Size) histogram:
     //
     const Int_t reach = 2;
-
     Stat_t summax = 0;
     Int_t  mode   = 0;
-
-    // FIXME: Is this necessary? We could use GetMaximumBin instead..
     for (Int_t ibin = 1+reach; ibin <= fHistRatio->GetNbinsX()-reach; ibin++)
     {
@@ -251 +255 @@
     }
 
-    fADC2Phot = TMath::Power(10, fHistRatio->GetBinCenter(mode));
+    fADC2PhotEl = TMath::Power(10, fHistRatio->GetBinCenter(mode));
 
     const Int_t num = fCalCam->GetSize();
@@ -257 +261 @@
     for (int i=0; i<num; i++)
     {
-
         MCalibrationChargePix &calpix = (MCalibrationChargePix&)(*fCalCam)[i];
-        //        MCalibrationQEPix     &qepix  = (MCalibrationQEPix&)    (*fQECam) [i];
-
-        const Float_t qe     = MCalibrationQEPix::gkDefaultAverageQE;
-        const Float_t factor = fADC2Phot/qe*calpix.GetMeanConvFADC2Phe();
-        //
-        // FIXME: Now, only the conversion to PHe is stored, need also the quantum efficiency simulated!!!
-        //
+        MCalibrationQEPix     &qepix  = (MCalibrationQEPix&)    (*fQECam) [i];
+
+        qepix.SetAverageQE(fPhot2PhotEl);
+
+        qepix.SetAvNormFFactor(1.);
+        // This factor should convert the default average QE for different colors to 
+        // average QE for a spectrum like that of Cherenkov light (see the documentration 
+        // of MCalibrationQEPix). 
+        // Here we obtain average QE using already a Cherenkov spectrum so AvNormFFacto 
+        // must be 1.
+
+        
+        Float_t factor = fADC2PhotEl;
+
+        //
+        // We take into account the (possibly) different gain of outer pixels:
+        //
+        if (fGeom->GetPixRatio(i) < 1.)
+          factor *= fHeaderFadc->GetAmplitud()/fHeaderFadc->GetAmplitudOuter();
+
         calpix.SetMeanConvFADC2Phe(factor);
         calpix.SetMeanConvFADC2PheVar(0.);
+
         calpix.SetMeanFFactorFADC2Phot(0.);
     }

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.h

@@ -27 +27 @@
     MMcFadcHeader             *fHeaderFadc;
 
-    Float_t fADC2Phot;
+    Float_t fADC2PhotEl;   // Conversion factor (photel / ADC count)
+    Float_t fPhot2PhotEl;  // Conversion factor (photons / photoelectron) = average QE
     Long_t  fEvents;