Changeset 5014

Timestamp:

09/14/04 19:10:30 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHCalibrationCam.cc (modified) (7 diffs)
• mhcalib/MHCalibrationCam.h (modified) (2 diffs)
• mhcalib/MHCalibrationChargeCam.cc (modified) (12 diffs)
• mhcalib/MHCalibrationChargeCam.h (modified) (1 diff)
• mhcalib/MHCalibrationRelTimeCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
 
  2004/09/14: Markus Gaug
+
+   * mhcalib/MHCalibration*Cam.[h,cc]
+     - added MBadpixelsIntenstiyCam
 
    * mbadpixels/MBadPixelsIntensityCam.[h,cc]

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -69 +69 @@
 #include "MCalibrationPix.h"
 
+#include "MBadPixelsIntensityCam.h"
+#include "MBadPixelsCam.h"
 #include "MBadPixelsPix.h"
-#include "MBadPixelsCam.h"
 
 #include "MGeomCam.h"
@@ -112 +113 @@
     :  fHistName(gsHistName),fHistTitle(gsHistTitle),
        fHistXTitle(gsHistXTitle),fHistYTitle(gsHistYTitle), 
-       fColor(MCalibrationCam::kNONE), 
+       fColor(MCalibrationCam::kNONE), fIntensBad(NULL),
        fBadPixels(NULL), fIntensCam(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL)
 {
@@ -466 +467 @@
 //
 // Gets or creates the pointers to:
+// - MBadPixelsIntensityCam
 // - MBadPixelsCam
 //
@@ -503 +505 @@
   const Int_t nareas   = fGeom->GetNumAreas();
 
-  fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam");
-  if (!fBadPixels)
-    {
-
-      fBadPixels = (MBadPixelsCam*)pList->FindCreateObj(AddSerialNumber("MBadPixelsCam"));
+  fIntensBad = (MBadPixelsIntensityCam*)pList->FindObject(AddSerialNumber("MBadPixelsIntensityCam"));
+  if (fIntensBad)
+    *fLog << inf << "Found MBadPixelsIntensityCam ... " << endl;
+  else
+    {
+      fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam");
       if (!fBadPixels)
         {
-          *fLog << err << "Cannot find nor create MBadPixelsCam ... abort." << endl;
-          return kFALSE;
+          
+          fBadPixels = (MBadPixelsCam*)pList->FindCreateObj(AddSerialNumber("MBadPixelsCam"));
+          if (!fBadPixels)
+            {
+              *fLog << err << "Cannot find nor create MBadPixelsCam ... abort." << endl;
+              return kFALSE;
+            }
+          else 
+            fBadPixels->InitSize(npixels);
         }
-      else 
-        fBadPixels->InitSize(npixels);
-    }
-
+    }
+  
   if (IsAverageing())
     {
@@ -538 +546 @@
       for (Int_t i=0; i<npixels; i++)
         {
-          if ((*fBadPixels)[i].IsBad())
+          
+          MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
+          if (bad.IsBad())
             continue;
           
@@ -647 +657 @@
         h->SetYTitle(fHistYTitle.Data());
         
-        InitHists(pix,(*fBadPixels)[i],i);
+        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
+        InitHists(pix,bad,i);
       }
   }
@@ -759 +770 @@
           h->SetYTitle(fHistYTitle.Data());
 
-          InitHists(pix,(*fBadPixels)[i],i);
+          MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
+          InitHists(pix,bad,i);
       }
   }

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h

@@ -34 +34 @@
 class MCalibrationCam;
 class MCalibrationPix;
+class MBadPixelsIntensityCam;
 class MBadPixelsCam;
 class MBadPixelsPix;
@@ -78 +79 @@
 
   MCalibrationCam::PulserColor_t fColor; // Colour of the pulsed LEDs
-  
+
+  MBadPixelsIntensityCam *fIntensBad;    //! Bad Pixels intensity calibration storage container  
   MBadPixelsCam    *fBadPixels;          //! Bad Pixels storage container
   MCalibrationIntensityCam *fIntensCam;  //! Intensity Calibration Cam with the results

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -127 +127 @@
 #include "MGeomPix.h"
 
+#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
 #include "MBadPixelsPix.h"
@@ -430 +431 @@
         h->SetYTitle(fAbsHistYTitle.Data());
 
-        InitHists((*this)[i],(*fBadPixels)[i],i);
+        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
+        InitHists((*this)[i],bad,i);
       }
   }
@@ -592 +594 @@
           h->SetYTitle(fAbsHistYTitle.Data());
 
-          InitHists(pix,(*fBadPixels)[i],i);
+          MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
+          InitHists(pix,bad,i);
       }
   }
@@ -949 +952 @@
         }
 
-      MBadPixelsPix          &bad    = (*fBadPixels)[i];
+      MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
 
       h = histhi.GetHGausHist();
@@ -979 +982 @@
         
         MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(i);
-        MBadPixelsPix          &bad    = (*fBadPixels)[i];
+        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
         
         if (histlo.IsExcluded())
@@ -1037 +1040 @@
         }
 
-      MBadPixelsPix          &bad    = fIntensCam 
+      MBadPixelsPix &bad    = fIntensCam 
         ? fIntensCam->GetAverageBadArea(j)
         : fCam->GetAverageBadArea(j);
@@ -1063 +1066 @@
         if (pix.IsHiGainSaturation())
           {
-            MBadPixelsPix          &bad    = fIntensCam
+            MBadPixelsPix &bad    = fIntensCam
               ? fIntensCam->GetAverageBadArea(j)  
               : fCam->GetAverageBadArea(j);      
@@ -1087 +1090 @@
         }
 
-      MBadPixelsPix          &bad    = fIntensCam 
+      MBadPixelsPix &bad = fIntensCam 
         ? fIntensCam->GetAverageBadSector(j)
         : fCam->GetAverageBadSector(j);      
@@ -1124 +1127 @@
   //
   FitHiGainArrays(fIntensCam ? (MCalibrationCam&)(*fIntensCam->GetCam()) : (MCalibrationCam&)(*fCam),
-                  *fBadPixels,
+                  fIntensBad ?                   (*fIntensBad->GetCam()) : *fBadPixels,
                   MBadPixelsPix::kHiGainNotFitted,
                   MBadPixelsPix::kHiGainOscillating);
@@ -1133 +1136 @@
   if (IsLoGain())
     FitLoGainArrays(fIntensCam ? (MCalibrationCam&)(*fIntensCam->GetCam()) : (MCalibrationCam&)(*fCam),
-                    *fBadPixels,
+                    fIntensBad ?                   (*fIntensBad->GetCam()) : *fBadPixels,
                     MBadPixelsPix::kLoGainNotFitted,
                     MBadPixelsPix::kLoGainOscillating);
@@ -1191 +1194 @@
 void MHCalibrationChargeCam::FinalizeBadPixels()
 {
-      
-  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
-    {
-      
-      MBadPixelsPix    &bad    = (*fBadPixels)[i];
+
+  MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
+      
+  for (Int_t i=0; i<badcam->GetSize(); i++)
+    {
+      
+      MBadPixelsPix    &bad    = (*badcam)[i];
       MCalibrationPix  &pix    = fIntensCam ? (*fIntensCam)[i] : (*fCam)[i];
 
@@ -1219 +1224 @@
         }
     }
-}
-
-// --------------------------------------------------------------------------
-//
-// Dummy, needed by MCamEvent
-//
-Bool_t MHCalibrationChargeCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
-{
-  return kTRUE;
 }
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h

@@ -119 +119 @@
   void SetAbsHistYTitle( const char *name )  { fAbsHistYTitle = name; }
    
-  Bool_t GetPixelContent ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) 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;    
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

@@ -105 +105 @@
 #include "MGeomPix.h"
 
+#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
 #include "MBadPixelsPix.h"
@@ -484 +485 @@
 
   FitHiGainArrays(fIntensCam ? (MCalibrationCam&)(*fIntensCam->GetCam()) : (MCalibrationCam&)(*fCam),
-                  *fBadPixels,
+                  fIntensBad ?                   (*fIntensBad->GetCam()) : *fBadPixels,
                   MBadPixelsPix::kRelTimeNotFitted,
                   MBadPixelsPix::kRelTimeOscillating);
@@ -490 +491 @@
   if (IsLoGain())        
     FitLoGainArrays(fIntensCam ? (MCalibrationCam&)(*fIntensCam->GetCam()) : (MCalibrationCam&)(*fCam),
-                    *fBadPixels,
+                    fIntensBad ?                   (*fIntensBad->GetCam()) : *fBadPixels,
                     MBadPixelsPix::kRelTimeNotFitted,
                     MBadPixelsPix::kRelTimeOscillating);
@@ -506 +507 @@
 {
 
-  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
-    {
-      
-      MBadPixelsPix          &bad    = (*fBadPixels)[i];
+  MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
+
+  for (Int_t i=0; i<badcam->GetSize(); i++)
+    {
+      MBadPixelsPix          &bad    = (*badcam)[i];
 
       if (bad.IsUncalibrated( MBadPixelsPix::kRelTimeNotFitted ))