Changeset 4974 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

09/13/04 13:14:17 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationCam.cc (modified) (23 diffs)
• MHCalibrationCam.h (modified) (5 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -42 +42 @@
 //
 // 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.
+// - SetAverageging() for calculating the event-by-event averages.
+// - 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.
@@ -99 +100 @@
 // - fPulserFrequency to fgPulserFrequency
 //
+// - SetAveregeing  (kTRUE);
+// - SetDebug       (kFALSE);
+// - SetLoGain      (kTRUE);
+//-  SetOscillations(kTRUE);
+//-  SetSizeCheck   (kTRUE);
+//
 MHCalibrationCam::MHCalibrationCam(const char *name, const char *title)
     :  fHistName(gsHistName),fHistTitle(gsHistTitle),
@@ -126 +133 @@
     SetPulserFrequency();
 
+    SetAverageing  (kTRUE);
     SetDebug       (kFALSE);
     SetLoGain      (kTRUE);
     SetOscillations(kTRUE);
+    SetSizeCheck   (kTRUE);
 }
 
@@ -172 +181 @@
   if (fHiGainArray)
     { fHiGainArray->ForEach(MHCalibrationPix,Reset)();  }
-  if (fAverageHiGainAreas)
-    { fAverageHiGainAreas->ForEach(MHCalibrationPix,Reset)();  }
-  if (fAverageHiGainSectors)
-    { fAverageHiGainSectors->ForEach(MHCalibrationPix,Reset)();  }
-
+  if (IsAverageing())
+    {
+      if (fAverageHiGainAreas)
+        { fAverageHiGainAreas->ForEach(MHCalibrationPix,Reset)();  }
+      if (fAverageHiGainSectors)
+        { fAverageHiGainSectors->ForEach(MHCalibrationPix,Reset)();  }
+    }
+  
   if (!IsLoGain())
     return;
@@ -182 +194 @@
   if (fLoGainArray)
     { fLoGainArray->ForEach(MHCalibrationPix,Reset)();  }
-  if (fAverageLoGainAreas)
-    { fAverageLoGainAreas->ForEach(MHCalibrationPix,Reset)();  }
-  if (fAverageLoGainSectors)
-    { fAverageLoGainSectors->ForEach(MHCalibrationPix,Reset)();  }
-  
+  if (IsAverageing())
+    {
+      if (fAverageLoGainAreas)
+        { fAverageLoGainAreas->ForEach(MHCalibrationPix,Reset)();  }
+      if (fAverageLoGainSectors)
+        { fAverageLoGainSectors->ForEach(MHCalibrationPix,Reset)();  }
+    }
 }
 
@@ -329 +343 @@
 {
 
+  //
+  // FIXME, this might be done faster and more elegant, by direct copy.
+  //
+  MHCalibrationCam *cam = new MHCalibrationCam();
+
+  cam->fRunNumbers             = fRunNumbers;
+  cam->fPulserFrequency        = fPulserFrequency;
+  cam->fFlags                  = fFlags;
+
+  if (!IsAverageing())
+    return cam;
+
   //  const Int_t nhi   = fHiGainArray->GetEntries();
   //  const Int_t nlo   = fLoGainArray->GetEntries();
@@ -334 +360 @@
   //  const Int_t nsehi = fAverageHiGainSectors->GetEntries();
   
-  //
-  // FIXME, this might be done faster and more elegant, by direct copy.
-  //
-  MHCalibrationCam *cam = new MHCalibrationCam();
-
   //  cam->fHiGainArray->Expand(nhi);
   //  cam->fLoGainArray->Expand(nlo);
@@ -387 +408 @@
   cam->fAverageAreaRelSigmaVar = fAverageAreaRelSigmaVar;   
   cam->fAverageSectorNum       = fAverageSectorNum;      
-  cam->fRunNumbers             = fRunNumbers;
-
-  cam->fPulserFrequency        = fPulserFrequency;
 
   return cam;
@@ -424 +442 @@
   }
 
+  /* not needed -> Class is never used twice
   fHiGainArray->Delete();
   fLoGainArray->Delete();
@@ -432 +451 @@
   fAverageHiGainSectors->Delete();
   fAverageLoGainSectors->Delete();
+  */
 
   return SetupHists(pList);
@@ -491 +511 @@
     }
 
-  //
-  // The function TArrayF::Set() already sets all entries to 0.
-  //
-  fAverageAreaNum.        Set(nareas);
-  fAverageAreaSat.        Set(nareas);           
-  fAverageAreaSigma.      Set(nareas);      
-  fAverageAreaSigmaVar.   Set(nareas);   
-  fAverageAreaRelSigma.   Set(nareas);   
-  fAverageAreaRelSigmaVar.Set(nareas);
-  fAverageSectorNum.      Set(nsectors);
-  fRunNumbers.            Set(fRunNumbers.GetSize()+1);
-
-  for (Int_t aidx=0; aidx<nareas; aidx++)
-      fAverageAreaNum[aidx] = 0;
-
-  for (Int_t sector=0; sector<nsectors; sector++)
-      fAverageSectorNum[sector] = 0;
-
-  for (Int_t i=0; i<npixels; i++)
-    {
-
-      if ((*fBadPixels)[i].IsBad())
-        continue;
-
-      fAverageAreaNum  [(*fGeom)[i].GetAidx()  ]++;
-      fAverageSectorNum[(*fGeom)[i].GetSector()]++;
+  if (IsAverageing())
+    {
+      //
+      // The function TArrayF::Set() already sets all entries to 0.
+      //
+      fAverageAreaNum.        Set(nareas);
+      fAverageAreaSat.        Set(nareas);           
+      fAverageAreaSigma.      Set(nareas);      
+      fAverageAreaSigmaVar.   Set(nareas);   
+      fAverageAreaRelSigma.   Set(nareas);   
+      fAverageAreaRelSigmaVar.Set(nareas);
+      fAverageSectorNum.      Set(nsectors);
+      fRunNumbers.            Set(fRunNumbers.GetSize()+1);
+      
+      for (Int_t aidx=0; aidx<nareas; aidx++)
+        fAverageAreaNum[aidx] = 0;
+      
+      for (Int_t sector=0; sector<nsectors; sector++)
+        fAverageSectorNum[sector] = 0;
+  
+      for (Int_t i=0; i<npixels; i++)
+        {
+          if ((*fBadPixels)[i].IsBad())
+            continue;
+          
+          fAverageAreaNum  [(*fGeom)[i].GetAidx()  ]++;
+          fAverageSectorNum[(*fGeom)[i].GetSector()]++;
+        }
     }
 
@@ -544 +566 @@
         h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
       }
+  
+  if (!IsAverageing())
+    return kTRUE;
   
   for (Int_t j=0; j<nareas; j++)
@@ -616 +641 @@
   }
 
+  if (!IsAverageing())
+    return;
+
   if (fAverageHiGainAreas->GetEntries()==0)
   {
@@ -725 +753 @@
   }
 
+  if (!IsAverageing())
+    return;
+
   if (fAverageLoGainAreas->GetEntries()==0)
   {
@@ -801 +832 @@
 {
 
+  if (!IsSizeCheck())
+    return FillHists(par,w);
+
   const Int_t npixels  = fGeom->GetNumPixels();
   const Int_t nareas   = fGeom->GetNumAreas();
@@ -814 +848 @@
     }
   
-  if (fAverageHiGainAreas->GetEntries() != nareas)
-    {
-      *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
-      return kFALSE;
-    }
-
-  if (fAverageHiGainSectors->GetEntries() != nsectors)
-    {
-      *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
-      return kFALSE;
-    }
-
   if (IsLoGain())
     {
@@ -833 +855 @@
           return kFALSE;
         }
+    }
+  
+  if (!IsAverageing())
+    return FillHists(par,w);
+
+  if (fAverageHiGainAreas->GetEntries() != nareas)
+    {
+      *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
+      return kFALSE;
+    }
+  
+  if (fAverageHiGainSectors->GetEntries() != nsectors)
+    {
+      *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
+      return kFALSE;
+    }
+  
+  if (IsLoGain())
+    {
       
       if (fAverageLoGainAreas->GetEntries() != nareas)
@@ -928 +969 @@
     }
 
+  if (!IsAverageing())
+    return;
+  
   for (Int_t j=0; j<fAverageHiGainAreas->GetSize(); j++)
     {
@@ -981 +1025 @@
     }
 
+  if (!IsAverageing())
+    return;
+  
   for (Int_t j=0; j<fAverageLoGainAreas->GetSize(); j++)
     {
@@ -1012 +1059 @@
 
   if (!fCam)
+    return;
+  
+  if (!IsAverageing())
     return;
   
@@ -1197 +1247 @@
 
 
-// --------------------------------------------------------------------------
-//
-// Dummy, needed by MCamEvent
-//
-Bool_t MHCalibrationCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
-{
-  return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// What MHCamera needs in order to draw an individual pixel in the camera
-//
-void MHCalibrationCam::DrawPixelContent(Int_t idx) const
-{
-}
-
 // -----------------------------------------------------------------------------
 // 
@@ -1224 +1257 @@
 void MHCalibrationCam::Draw(const Option_t *opt)
 {
+
+  if (!IsAverageing())
+    return;
 
   const Int_t nareas = fAverageHiGainAreas->GetEntries();
@@ -1316 +1352 @@
       rc = kTRUE;
     }
+  if (IsEnvDefined(env, prefix, "SizeCheck", print))
+    {
+      SetSizeCheck(GetEnvValue(env, prefix, "SizeCheck", IsSizeCheck()));
+      rc = kTRUE;
+    }
+  if (IsEnvDefined(env, prefix, "Averageing", print))
+    {
+      SetAverageing(GetEnvValue(env, prefix, "Averageing", IsAverageing()));
+      rc = kTRUE;
+    }
   
   if (IsEnvDefined(env, prefix, "Nbins", print))

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h

@@ -90 +90 @@
   Int_t      fPulserFrequency;           // Light pulser frequency
 
-  enum { kDebug, kLoGain, kOscillations }; // Possible flags
+  enum { kDebug, kLoGain, kAverageing,
+         kOscillations, kSizeCheck };     // Possible flags
   
   Byte_t     fFlags;                     // Bit-field to hold the flags
@@ -132 +133 @@
   void InitHists       ( MHCalibrationPix &hist, MBadPixelsPix &bad, const Int_t i);
 
-  Bool_t IsDebug       () const  { return TESTBIT(fFlags,kDebug);        }
+  Bool_t IsAverageing  () const  { return TESTBIT(fFlags,kAverageing);   }
+  Bool_t IsDebug       () const  { return TESTBIT(fFlags,kDebug);        }  
+  Bool_t IsLoGain      () const  { return TESTBIT(fFlags,kLoGain);       }
   Bool_t IsOscillations() const  { return TESTBIT(fFlags,kOscillations); }
-  Bool_t IsLoGain      () const  { return TESTBIT(fFlags,kLoGain);       }
+  Bool_t IsSizeCheck   () const  { return TESTBIT(fFlags,kSizeCheck);    }
   
   Int_t ReadEnv        ( const TEnv &env, TString prefix, Bool_t print);
@@ -156 +159 @@
   void   Draw(const Option_t *opt);
 
-  Bool_t GetPixelContent ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
-  void   DrawPixelContent( Int_t num )  const;    
+  Bool_t GetPixelContent ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const { return kTRUE; }
+  void   DrawPixelContent( Int_t num )  const  {}
 
   const Int_t              GetAverageAreas       ()          const;      
@@ -181 +184 @@
  
   void SetColor                   ( const MCalibrationCam::PulserColor_t color) { fColor = color; }
+  void SetAverageing              ( const Bool_t b=kTRUE ) { b 
+                                                                ? SETBIT(fFlags,kAverageing) 
+                                                                : CLRBIT(fFlags,kAverageing); }
   void SetDebug                   ( const Bool_t b=kTRUE ) { b 
                                                                 ? SETBIT(fFlags,kDebug) 
@@ -190 +196 @@
                                                                 ? SETBIT(fFlags,kOscillations) 
                                                                 : CLRBIT(fFlags,kOscillations); }
+  void SetSizeCheck               ( const Bool_t b=kTRUE ) { b 
+                                                                ? SETBIT(fFlags,kSizeCheck) 
+                                                                : CLRBIT(fFlags,kSizeCheck); }
   void SetHistName  ( const char *name )  { fHistName  = name;  }
   void SetHistTitle ( const char *name )  { fHistTitle = name;  }