Changeset 2886 for trunk/MagicSoft/Mars/mcalib

Timestamp:

01/22/04 20:54:16 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

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

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

@@ -71 +71 @@
   fEvents = 0;
 
-  fHistRatio = new TH1F("HistRatio", "Ratio fPassPhotCone/fSize", 1000., 0., 10.);
+  fHistRatio = new TH1F("HistRatio", "log10(fPassPhotCone/fSize)", 1500., -3., 3.);
+  fHistRatio->GetXaxis()->SetTitle("log_{10}(fPassPhotCone / fSize) (in photons/ADC count)");
 }
 
@@ -165 +166 @@
     }
 
+  for (UInt_t ipix = 0; ipix < fGeom->GetNumPixels(); ipix++)
+    {
+      if (fHeaderFadc->GetPedestalRmsHigh(ipix) > 0 ||
+          fHeaderFadc->GetPedestalRmsLow(ipix) > 0 )
+        {
+          *fLog << err << endl << endl << dbginf << "You are trying to calibrate the data using a Camera file produced with added noise. Please use a noiseless file for calibration. Aborting..." << endl << endl;
+          return kFALSE;
+        }
+    }
+
   //
   // FIXME: Check that the relevant parameters in the FADC header are the
-  // same for all the analyzed data!
+  // same for all the analyzed data, both Calibration and Analyzed data!
   //
 
@@ -181 +192 @@
 {
 
+  //
+  // Exclude events with some saturated pixel
+  //
   if ( fNew->GetNumSaturatedPixels() > 0 )
     return kTRUE;
 
+  //
+  // Exclude events with low Size (larger fluctuations)
+  // FIXME? The present cut (1000 "inner-pixel-counts") is somehow arbitrary. 
+  // Might it be optimized? 
+  //
+  if ( fHillas->GetSize() < 1000 )
+    return kTRUE;
+
   fADC2Phot += fMcEvt->GetPassPhotCone() / fHillas->GetSize();
   fEvents ++;
 
-  fHistRatio->Fill(fMcEvt->GetPassPhotCone()/fHillas->GetSize());
+  fHistRatio->Fill(log10(fMcEvt->GetPassPhotCone()/fHillas->GetSize()));
 
   return kTRUE;
@@ -207 +229 @@
     }
 
+  //
+  // For the calibration we no longer use the mean, but thepeak of the distribution:
+  //
+
+  Float_t summax = 0.;
+  Int_t mode = 0;
+  Int_t reach = 2;
+  for (Int_t ibin = 1+reach; ibin <= fHistRatio->GetNbinsX()-reach; ibin++)
+    {
+      Float_t sum = 0;
+      for(Int_t k = ibin-reach; k <= ibin+reach; k++)
+        sum += fHistRatio->GetBinContent(k);
+      if (sum > summax)
+        {
+          summax = sum;
+          mode = ibin;
+        }
+    }
+
+  fADC2Phot = pow(10., fHistRatio->GetXaxis()->GetBinCenter(mode));
+
   const int num = fCalCam->GetSize();
   

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.h

@@ -28 +28 @@
     Long_t  fEvents;
 
-    TH1F*   fHistRatio;
+    TH1F*   fHistRatio; // Histogram for monitoring the calibration.
 
     Bool_t CheckRunType(MParList *pList) const;
@@ -39 +39 @@
     MMcCalibrationCalc(const char *name=NULL, const char *title=NULL);
 
+    TH1F*   GetHist() { return fHistRatio; }
+
     ClassDef(MMcCalibrationCalc, 0)   // Task which obtains, for MC files, the calibration factor from ADC counts to photons. 
 };