Changeset 4873 for trunk/MagicSoft/Mars

Timestamp:

09/07/04 10:04:04 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationCam.cc (modified) (14 diffs)
• mcalib/MHCalibrationCam.h (modified) (2 diffs)
• mcalib/MHGausEvents.cc (modified) (1 diff)
• mcalib/MHGausEvents.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
    * mcalib/MHGausEvents.[h,cc]
      - added function IsOnlyUnderflow()
+
+   * mcalib/MHCalibrationCam.[h,cc]
+     - added bool kLoGain which is set if number of LoGain Slices in 
+       MRawRunHeader is not 0. This excludes the low gain calculations 
+       in case that there is no lowgain at all. 
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc

@@ -41 +41 @@
 // dealing with calibration pixels derive from MHGausEvents.
 //
+// The following flag can be set:
+// - SetDebug() for debug output.
+// - SetLoGain() for the case that low-gain slices are available, but 
+//               MRawRunHeader::GetNumLoGainSlices() gives still 0.
+// 
+// The flag fLoGain steers if low-gain signal is treated at all or not.
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MHCalibrationCam.h"
@@ -91 +98 @@
 MHCalibrationCam::MHCalibrationCam(const char *name, const char *title)
     :  fColor(MCalibrationCam::kNONE), 
-       fBadPixels(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL), fDebug(kFALSE)
+       fBadPixels(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL), 
+       fDebug(kFALSE), fLoGain(kFALSE)
 {
 
@@ -483 +491 @@
 
   if (fRunHeader)
-    fRunNumbers[fRunNumbers.GetSize()-1] = fRunHeader->GetRunNumber();
+    {
+      fRunNumbers[fRunNumbers.GetSize()-1] = fRunHeader->GetRunNumber();
+      fLoGain = fRunHeader->GetNumSamplesLoGain();
+    }
 
   if (!ReInitHists(pList))
@@ -497 +508 @@
     }
 
-  for (Int_t i=0; i<fLoGainArray->GetEntries(); i++)
-    {
-      TH1F *h = (*this)(i).GetHGausHist();
-      h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
-    }
+  if (fLoGain)
+    for (Int_t i=0; i<fLoGainArray->GetEntries(); i++)
+      {
+        TH1F *h = (*this)(i).GetHGausHist();
+        h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
+      }
   
   for (Int_t j=0; j<nareas; j++)
@@ -509 +521 @@
     }
   
-  for (Int_t j=0; j<nareas; j++)
-    {
-      TH1F *h = GetAverageLoGainArea(j).GetHGausHist();
-      h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
-    }
+  if (fLoGain)
+    for (Int_t j=0; j<nareas; j++)
+      {
+        TH1F *h = GetAverageLoGainArea(j).GetHGausHist();
+        h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
+      }
   
   for (Int_t j=0; j<nsectors; j++)
@@ -521 +534 @@
     }
   
-  for (Int_t j=0; j<nsectors; j++)
-    {
-      TH1F *h = GetAverageLoGainSector(j).GetHGausHist();
-      h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
-    }
-
+  if (fLoGain)
+    for (Int_t j=0; j<nsectors; j++)
+      {
+        TH1F *h = GetAverageLoGainSector(j).GetHGausHist();
+        h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
+      }
+  
   return kTRUE;
 }
@@ -564 +578 @@
     }
   
-  if (fLoGainArray->GetEntries() != npixels)
-    {
-      *fLog << err << "ERROR - Size mismatch... abort." << endl;
-      return kFALSE;
-    }
+  if (fLoGain)
+    if (fLoGainArray->GetEntries() != npixels)
+      {
+        *fLog << err << "ERROR - Size mismatch... abort." << endl;
+        return kFALSE;
+      }
   
   if (fAverageHiGainAreas->GetEntries() != nareas)
@@ -576 +591 @@
     }
 
-  if (fAverageLoGainAreas->GetEntries() != nareas)
-    {
-      *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
-      return kFALSE;
-    }
-
+  if (fLoGain)
+    if (fAverageLoGainAreas->GetEntries() != nareas)
+      {
+        *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
+        return kFALSE;
+    }
+  
   if (fAverageHiGainSectors->GetEntries() != nsectors)
     {
@@ -588 +604 @@
     }
 
-  if (fAverageLoGainSectors->GetEntries() != nsectors)
-    {
-      *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
-      return kFALSE;
-    }
-
+  if (fLoGain)
+    if (fAverageLoGainSectors->GetEntries() != nsectors)
+      {
+        *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
+        return kFALSE;
+      }
+  
   return FillHists(par, w);
 }
@@ -802 +819 @@
 
 
-  if (hist.IsEmpty())
+  if (hist.IsEmpty() || hist.IsOnlyOverflow() || hist.IsOnlyUnderflow())
     return;
-
+  
   //
   // 2) Fit the Hi Gain histograms with a Gaussian
@@ -881 +898 @@
 {
 
-  if (hist.IsEmpty())
+  if (hist.IsEmpty() || hist.IsOnlyOverflow() || hist.IsOnlyUnderflow())
       return;
   
@@ -970 +987 @@
   pad->SetBorderMode(0);
 
-  pad->Divide(2,nareas);
+  pad->Divide(fLoGain ? 2 : 1,nareas);
 
   for (Int_t i=0; i<nareas;i++) 
     {
 
-      pad->cd(2*(i+1)-1);
+      pad->cd(fLoGain ? 2*(i+1)-1 : i+1);
       GetAverageHiGainArea(i).Draw(opt);
 
@@ -983 +1000 @@
                          fAverageAreaRelSigma[i], fAverageAreaRelSigmaVar[i]);
 
-      pad->cd(2*(i+1));
-      GetAverageLoGainArea(i).Draw(opt);
+      if (fLoGain)
+        {
+          pad->cd(2*(i+1));
+          GetAverageLoGainArea(i).Draw(opt);
+        }
       
       if (fAverageAreaSat[i])
@@ -991 +1011 @@
                          fAverageAreaRelSigma[i], fAverageAreaRelSigmaVar[i]);
     }
-
+      
 }
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h

@@ -80 +80 @@
   Int_t      fPulserFrequency;           // Light pulser frequency
   Bool_t     fDebug;                     // Debug option is used?
+  Bool_t     fLoGain;                    // Is Low-Gain available 
   
   virtual Bool_t SetupHists(const MParList *pList);
@@ -161 +162 @@
   void SetColor               ( const MCalibrationCam::PulserColor_t color ) { fColor   = color; }
   void SetDebug               ( const Bool_t b=kTRUE )               { fDebug           = b;     }
+  void SetLoGain              ( const Bool_t b=kTRUE )               { fLoGain          = b;     }
   void SetAverageNbins        ( const Int_t bins=fgAverageNbins )    { fAverageNbins    = bins;  }
   void SetNumLoGainSaturationLimit( const Float_t lim )    { fNumLoGainSaturationLimit  = lim;   }

trunk/MagicSoft/Mars/mcalib/MHGausEvents.cc

@@ -809 +809 @@
 
 
+// --------------------------------------------------------------------------
+//
+// If fFExpFit exists, returns fit parameter 1 (Slope of Exponential fit), 
+// otherwise 0.
+//
 const Double_t MHGausEvents::GetSlope()  const 
 {

trunk/MagicSoft/Mars/mcalib/MHGausEvents.h

@@ -125 +125 @@
   const Bool_t IsGausFitOK()             const; 
   const Bool_t IsOnlyOverflow()          const;
-  const Bool_t IsUnderOverflow()         const;  
+  const Bool_t IsOnlyUnderflow()         const;  
 
   // Fill