Changeset 6329

Timestamp:

02/10/05 01:45:41 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationTestCam.h (modified) (1 diff)
• mhcalib/HCalibLinkDef.h (modified) (1 diff)
• mhcalib/MHCalibrationTestTimeCam.h (modified) (1 diff)
• mhcalib/MHPedestalCam.cc (modified) (20 diffs)
• mhcalib/MHPedestalCam.h (modified) (4 diffs)
• mhcalib/MHPedestalPix.cc (added)
• mhcalib/MHPedestalPix.h (added)
• mhcalib/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -64 +64 @@
      - initialize the bad events counters to 0 also in constructor 
      - release the limit for bad events a bit
+
+   * mcalib/MCalibrationTestCam.h
+     - take out include of TArrayI (already in base class)
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationTestCam.h

@@ -4 +4 @@
 #ifndef MARS_MCalibrationCam
 #include "MCalibrationCam.h"
-#endif
-
-#ifndef ROOT_TArrayI
-#include <TArrayI.h>
 #endif
 

trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h

@@ -16 +16 @@
 #pragma link C++ class MHCalibrationHiLoCam+;
 #pragma link C++ class MHPedestalCam+;
+#pragma link C++ class MHPedestalPix+;
 #pragma link C++ class MHCalibrationTestTimeCam+;
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.h

@@ -14 +14 @@
   static const Axis_t  fgFirst;        //! Default for fFirst  (now set to: -0.5 )
   static const Axis_t  fgLast;         //! Default for fLast   (now set to: 29.5 )
-  static const Float_t fgProbLimit;    //! The default for fProbLimit (now set to: 0.000001)  
+  static const Float_t fgProbLimit;    //! Default for fProbLimit (now set to: 0.000001)  
   
   static const TString gsHistName;     //! Default Histogram names

trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@atsro.uni-wuerzburh.de>
 !   Author(s): Markus Gaug   02/2004 <mailto:markus@ifae.es>
 !
@@ -91 +90 @@
 #include "MHPedestalPix.h"
 
-#include "MBadPixelsCam.h"
-
 #include "MLog.h"
 #include "MLogManip.h"
@@ -103 +100 @@
 #include "MPedestalCam.h"
 #include "MPedestalPix.h"
+
+#include "MCalibrationIntensityCam.h"
 #include "MCalibrationPix.h"
+
+#include "MBadPixelsIntensityCam.h"
+#include "MBadPixelsCam.h"
 
 #include "MGeomCam.h"
@@ -118 +120 @@
 using namespace std;
 
-const Int_t      MHPedestalCam::fgNbins    = 100;
-const Axis_t     MHPedestalCam::fgFirst    = -50.;
-const Axis_t     MHPedestalCam::fgLast     =  50.;
+const Int_t   MHPedestalCam::fgNbins      = 100;
+const Axis_t  MHPedestalCam::fgFirst      = -49.;
+const Axis_t  MHPedestalCam::fgLast       = 151.;
 const TString MHPedestalCam::gsHistName   = "Pedestal";
 const TString MHPedestalCam::gsHistTitle  = "Pedestal";
 const TString MHPedestalCam::gsHistXTitle = "Charge [FADC slices]";
 const TString MHPedestalCam::gsHistYTitle = "Nr. events";
+const TString MHPedestalCam::fgNamePedestalCam = "MPedestalCam";
 // --------------------------------------------------------------------------
 //
@@ -132 +135 @@
 // - fExtractHiGainSlices to 0.
 // - the event frequency to 1200 Hz.
-// - the fRenorm flag to kFALSE
+// - the fRenormflag to kFALSE
 //
 // - fNbins to fgNbins
@@ -144 +147 @@
 //
 MHPedestalCam::MHPedestalCam(const char *name, const char *title) 
-    : fNumEvents(0), fExtractHiGainSlices(0.)
+    : fNamePedestalCamOut(fgNamePedestalCam), fNumEvents(0), 
+      fExtractHiGainSlices(0.), fPedestalsOut(NULL)
 {
 
@@ -151 +155 @@
   
   SetPulserFrequency(1200);
-  SetRenorm(kTRUE);
+  SetRenorm(kFALSE);
   SetLoGain(kFALSE);
 
@@ -162 +166 @@
   SetHistXTitle(gsHistXTitle.Data());
   SetHistYTitle(gsHistYTitle.Data());
+
 }
 
@@ -170 +175 @@
 // Resets:
 // - fSum
-// - fSum2
+// - fSumSquare
 // - fAreaSum
-// - fAreaSum2
-// - fAreaVal
+// - fAreaSumSquare
+// - fAreaNum
 // - fSectorSum
-// - fSectorSum2
-// - fSectorVal
+// - fSectorSumSquare
+// - fSectorNum
 //
 void MHPedestalCam::ResetHists()
@@ -190 +195 @@
       // Reset contents of arrays.
       fSum.Reset();
-      fSum2.Reset();
+      fSumSquare.Reset();
       
       fAreaSum. Reset();
-      fAreaSum2.Reset();
-      fAreaVal.Reset();
+      fAreaSumSquare.Reset();
+      fAreaNum.Reset();
       
       fSectorSum. Reset();
-      fSectorSum2.Reset();
-      fSectorVal.Reset();
-    }
-}
-
+      fSectorSumSquare.Reset();
+      fSectorNum.Reset();
+    }
+}
 // --------------------------------------------------------------------------
 //
@@ -269 +273 @@
 
   MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
-  if (!signal)
-    {
-      *fLog << err << "Cannot find MExtractedSignalCam... abort." << endl;
+  if (!signal && fRenorm)
+    {
+      *fLog << err << "Cannot find MExtractedSignalCam, but re-normalization switched on..."
+            << " Cannot find number of used slices ...abort." << endl;
       return kFALSE;
     }
   
 
-  fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam");
-
-  if (!fPedestals)
-    *fLog << warn << "Cannot find MPedestalCam ..." << endl;
+  fPedestalsOut = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCamOut),"MPedestalCam");
+
+  if (!fPedestalsOut)
+    {
+      *fLog << err << "Cannot find nor create outgoing MPedestalCam ..." << endl;
+      return kFALSE;
+    }
 
   const Int_t npixels  = fGeom->GetNumPixels();
@@ -295 +303 @@
   }
   
+  InitHiGainArrays(npixels,nareas,nsectors);
+
+  if (fSum.GetSize()==0)
+    {
+      fSum.       Set(npixels);
+      fSumSquare.      Set(npixels);
+      fAreaSum.   Set(nareas);
+      fAreaSumSquare.  Set(nareas);
+      fAreaNum.  Set(nareas);
+      fSectorSum. Set(nsectors);
+      fSectorSumSquare.Set(nsectors);
+      fSectorNum.Set(nsectors);
+    }
+
+  fNumEvents = 0;
+
+  if (!signal)
+    return kTRUE;
+  
+  
   Float_t sliceshi = signal->GetNumUsedHiGainFADCSlices();
-
+  
   if (sliceshi == 0.)
     {
       *fLog << err << "Number of used signal slices in MExtractedSignalCam is zero  ... abort." 
-           << endl;
+            << endl;
       return kFALSE;
     }
-
+  
   if (fExtractHiGainSlices != 0. && sliceshi != fExtractHiGainSlices )
     {
       *fLog << err << "Number of used High Gain signal slices changed in MExtractedSignalCam  ... abort." 
-           << endl;
+            << endl;
       return kFALSE;
     }
-
+  
   fExtractHiGainSlices = sliceshi;
-
   *fLog << endl;
   *fLog << inf << GetDescriptor() 
-       << ": Number of found High Gain signal slices: " << fExtractHiGainSlices << endl;
-
-  InitHiGainArrays(npixels,nareas,nsectors);
-
-  if (fSum.GetSize()==0)
-    {
-      fSum.       Set(npixels);
-      fSum2.      Set(npixels);
-      fAreaSum.   Set(nareas);
-      fAreaSum2.  Set(nareas);
-      fAreaVal.  Set(nareas);
-      fSectorSum. Set(nsectors);
-      fSectorSum2.Set(nsectors);
-      fSectorVal.Set(nsectors);
-    }
-
-  fNumEvents = 0;
+        << ": Number of found High Gain signal slices: " << fExtractHiGainSlices << endl;
 
   return kTRUE;
 }
 
+// --------------------------------------------------------------------------
+//
+// Initializes the High Gain Arrays:
+//
+// - For every entry in the expanded arrays: 
+//   * Initialize an MHCalibrationChargePix
+//   * Set Binning from  fNbins, fFirst and fLast
+//   * Set Binning of Abs Times histogram from  fAbsNbins, fAbsFirst and fAbsLast
+//   * Set Histgram names and titles from fHistName and fHistTitle
+//   * Set Abs Times Histgram names and titles from fAbsHistName and fAbsHistTitle
+//   * Set X-axis and Y-axis titles from fHistXTitle and fHistYTitle
+//   * Set X-axis and Y-axis titles of Abs Times Histogram from fAbsHistXTitle and fAbsHistYTitle
+//   * Call InitHists
+//
+//
+void MHPedestalCam::InitHiGainArrays(const Int_t npixels, const Int_t nareas, const Int_t nsectors)
+{
+  
+  if (fHiGainArray->GetSize()==0)
+  {
+      for (Int_t i=0; i<npixels; i++)
+      {
+        fHiGainArray->AddAt(new MHPedestalPix(Form("%sHiGainPix%04d",fHistName.Data(),i),
+                                                       Form("%s High Gain Pixel%04d",fHistTitle.Data(),i)),i);
+
+        MHPedestalPix &pix = (MHPedestalPix&)(*this)[i];
+
+        pix.SetNbins(fNbins);
+        pix.SetFirst(fFirst);
+        pix.SetLast (fLast);
+
+        pix.SetProbLimit(fProbLimit);
+
+        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
+        InitHists(pix,bad,i);
+      }
+  }
+
+  if (!IsAverageing())
+    return;
+
+  if (fAverageHiGainAreas->GetSize()==0)
+  {
+    for (Int_t j=0; j<nareas; j++)
+      {
+        fAverageHiGainAreas->AddAt(new MHPedestalPix(Form("%sHiGainArea%d",fHistName.Data(),j),
+                                                  Form("%s High Gain Area Idx %d",fHistTitle.Data(),j)),j);
+        
+        MHPedestalPix &pix = (MHPedestalPix&)GetAverageHiGainArea(j);
+        
+        pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas));
+        pix.SetFirst(fFirst);
+        pix.SetLast (fLast);
+        
+        InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+
+      }
+  }
+  
+  if (fAverageHiGainSectors->GetSize()==0)
+  {
+      for (Int_t j=0; j<nsectors; j++)
+        {
+          fAverageHiGainSectors->AddAt(new MHPedestalPix(Form("%sHiGainSector%02d",fHistName.Data(),j),
+                                                      Form("%s High Gain Sector %02d",fHistTitle.Data(),j)),j);
+
+          MHPedestalPix &pix = (MHPedestalPix&)GetAverageHiGainSector(j);
+
+          pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas));
+          pix.SetFirst(fFirst);
+          pix.SetLast (fLast);
+
+          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+
+      }
+  }
+}
 
 // -------------------------------------------------------------------------------
@@ -352 +440 @@
 {
 
-  MExtractedSignalCam *signal = (MExtractedSignalCam*)par;
-  if (!signal)
-    {
-      *fLog << err << "No argument in MExtractedSignalCam::Fill... abort." << endl;
+  MPedestalCam *pedestal = (MPedestalCam*)par;
+  if (!pedestal)
+    {
+      *fLog << err << "No argument in MHPedestalCam::Fill... abort." << endl;
       return kFALSE;
     }
@@ -376 +464 @@
           continue;
 
-      const MExtractedSignalPix &pix = (*signal)[i];
-
-      const Float_t pedhi = pix.GetExtractedSignalHiGain();
+      const MPedestalPix &ped = (*pedestal)[i];
+
+      const Float_t pedes = ped.GetPedestal();
 
       const Int_t aidx   = (*fGeom)[i].GetAidx();
       const Int_t sector = (*fGeom)[i].GetSector();
 
-      histhi.FillHistAndArray(pedhi) ;
-
-      fSum[i]            += pedhi;
-      fAreaSum[aidx]     += pedhi;
-      fSectorSum[sector] += pedhi;      
-
-      const Float_t sqrsum  = pedhi*pedhi;
-      fSum2[i]            += sqrsum;
-      fAreaSum2[aidx]     += sqrsum;
-      fSectorSum2[sector] += sqrsum;      
-
-      sumareahi  [aidx]   += pedhi;
+      histhi.FillHistAndArray(pedes) ;
+
+      fSum[i]            += pedes;
+      fAreaSum[aidx]     += pedes;
+      fSectorSum[sector] += pedes;      
+
+      const Float_t sqrsum  = pedes*pedes;
+      fSumSquare[i]            += sqrsum;
+      fAreaSumSquare[aidx]     += sqrsum;
+      fSectorSumSquare[sector] += sqrsum;      
+
+      sumareahi  [aidx]   += pedes;
       numareahi  [aidx]   ++;
-      sumsectorhi[sector] += pedhi;
+      sumsectorhi[sector] += pedes;
       numsectorhi[sector] ++;
 
@@ -449 +537 @@
     {
       
-      MHCalibrationPix &hist = (*this)[i];
+      MHPedestalPix &hist = (MHPedestalPix&)(*this)[i];
       MCalibrationPix &pix   = (*fCam)[i];
       
@@ -456 +544 @@
       //
       pix.SetLoGainMean    ( fSum[i] / fNumEvents  );
-      const Double_t diff = fSum2[i] - fSum[i]*fSum[i]/fNumEvents;
+      const Double_t diff = fSumSquare[i] - fSum[i]*fSum[i]/fNumEvents;
       pix.SetLoGainSigma   ( diff > 0. ? TMath::Sqrt( diff / (fNumEvents-1) ) : 0.);
       pix.SetLoGainMeanVar ( pix.GetLoGainSigma() * pix.GetLoGainSigma() / fNumEvents  );
@@ -467 +555 @@
       // 2) Fit the Hi Gain histograms with a Gaussian
       //
+      //      if (i%100)
+      //        hist.FitTripleGaus();
+      //      else
       hist.FitGaus();
       //
@@ -529 +620 @@
       // 6) Store calculated means and variances in the low-gain slices
       //
-      const ULong_t aevts = fNumEvents * fAreaVal[j];
+      const ULong_t aevts = fNumEvents * fAreaNum[j];
       if (aevts <= 1)
         continue;
 
       pix.SetLoGainMean ( fAreaSum[j] / aevts  );
-      const Double_t diff = fAreaSum2[j] - fAreaSum[j]*fAreaSum[j]/aevts ;
+      const Double_t diff = fAreaSumSquare[j] - fAreaSum[j]*fAreaSum[j]/aevts ;
       pix.SetLoGainSigma( diff > 0. ? TMath::Sqrt( diff / (aevts-1) ) : 0.);
     }
@@ -573 +664 @@
       // 6) Store calculated means and variances in the low-gain slices
       //
-      const ULong_t sevts = fNumEvents * fSectorVal[j];
+      const ULong_t sevts = fNumEvents * fSectorNum[j];
       if (sevts <= 1)
         continue;
 
       pix.SetLoGainMean ( fSectorSum[j] / sevts  );
-      const Double_t diff = fSectorSum2[j] - fSectorSum[j]*fSectorSum[j]/sevts ;
+      const Double_t diff = fSectorSumSquare[j] - fSectorSum[j]*fSectorSum[j]/sevts ;
       pix.SetLoGainSigma( diff > 0. ? TMath::Sqrt( diff / (sevts-1) ) : 0.);
     }
@@ -694 +785 @@
     return kFALSE;
 
-  const Float_t ped      = (*fPedestals)[idx].GetPedestal();
-  const Float_t rms      = (*fPedestals)[idx].GetPedestalRms();
-
-  const Float_t entsqr    =  TMath::Sqrt((Float_t)fPedestals->GetTotalEntries());
+  const Float_t ped      = (*fPedestalsOut)[idx].GetPedestal();
+  const Float_t rms      = (*fPedestalsOut)[idx].GetPedestalRms();
+
+  const Float_t entsqr    =  TMath::Sqrt((Float_t)fPedestalsOut->GetTotalEntries());
 
   const Float_t pederr   = rms/entsqr;

trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.h

@@ -17 +17 @@
 private:
 
-  static const Int_t   fgNbins;         //! Default number of bins        (now set to: 100  )
-  static const Axis_t  fgFirst;         //! Default lower histogram limit (now set to: -50. )
-  static const Axis_t  fgLast;          //! Default upper histogram limit (now set to:  50. )
-                                        
-  static const TString gsHistName;      //! Default Histogram names
-  static const TString gsHistTitle;     //! Default Histogram titles
-  static const TString gsHistXTitle;    //! Default Histogram x-axis titles
-  static const TString gsHistYTitle;    //! Default Histogram y-axis titles
+  static const Int_t   fgNbins;           //! Default number of bins        (now set to: 100  )
+  static const Axis_t  fgFirst;           //! Default lower histogram limit (now set to: -50. )
+  static const Axis_t  fgLast;            //! Default upper histogram limit (now set to:  50. )
+                                           
+  static const TString gsHistName;        //! Default Histogram names
+  static const TString gsHistTitle;       //! Default Histogram titles
+  static const TString gsHistXTitle;      //! Default Histogram x-axis titles
+  static const TString gsHistYTitle;      //! Default Histogram y-axis titles
+
+  static const TString fgNamePedestalCam; //! "MPedestalCam"
+  
+  TString fNamePedestalCamOut;            // Name of the 'MPedestalCam' container with results
 
   ULong_t fNumEvents;                     // Number of processed events
@@ -31 +35 @@
   Float_t fExtractLoGainSlices;           // Number of FADC slices used for low  gain signal extraction
 
-  MPedestalCam *fPedestals;               //! Pedestal Cam filled by MPedCalcPedRun
-  
+  MPedestalCam *fPedestalsOut;            //! Pedestal Cam with results
+   
   Bool_t  fRenorm;                        // Flag if the results will be re-normalized
 
-  MArrayD fSum;             //! sum of values  
-  MArrayD fSum2;            //! sum of squared values
-  MArrayD fAreaSum;         //! averaged sum of values per area idx
-  MArrayD fAreaSum2;        //! averaged sum of squared values per area idx
-  MArrayI fAreaVal;         //! number of valid pixel with area idx
-  MArrayD fSectorSum;       //! averaged sum of values per sector
-  MArrayD fSectorSum2;      //! averaged sum of squared values per sector
-  MArrayI fSectorVal;       //! number of valid pixel with sector idx
+  MArrayD fSum;                           //! sum of values  
+  MArrayD fSumSquare;                     //! sum of squared values
+  MArrayD fAreaSum;                       //! averaged sum of values per area idx
+  MArrayD fAreaSumSquare;                 //! averaged sum of squared values per area idx
+  MArrayI fAreaNum;                       //! number of valid pixel with area idx
+  MArrayI fSectorNum;                     //! number of valid pixel with sector idx
+  MArrayD fSectorSum;                     //! averaged sum of values per sector
+  MArrayD fSectorSumSquare;               //! averaged sum of squared values per sector
   
   Bool_t ReInitHists(MParList *pList);
   Bool_t FillHists(const MParContainer *par, const Stat_t w=1);
   Bool_t FinalizeHists();
+  
+  void   InitHiGainArrays( const Int_t npix, const Int_t nareas, const Int_t nsectors );
   
   void RenormResults();
@@ -55 +61 @@
   MHPedestalCam(const char *name=NULL, const char *title=NULL);
 
-  // Clone
+ // Clone
   TObject *Clone(const char *name="") const;
 
@@ -62 +68 @@
 
   void ResetHists();
-  void SetRenorm( const Bool_t b=kTRUE )  {  fRenorm = b; }
+
+  void SetNamePedestalCamOut(const char *name) { fNamePedestalCamOut = name; }
+  void SetRenorm         (const Bool_t b=kTRUE )  {  fRenorm = b; }
   
   ClassDef(MHPedestalCam, 1)    // Histogram class for Charge Camera Pedestals 

trunk/MagicSoft/Mars/mhcalib/Makefile

@@ -43 +43 @@
            MHCalibrationTestCam.cc \
            MHPedestalCam.cc \
+           MHPedestalPix.cc \
            MHCalibrationTestTimeCam.cc \
            MHGausEvents.cc