Changeset 8417 for trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc

Timestamp:

04/18/07 16:34:51 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.20 2006-10-19 14:01:49 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.21 2007-04-18 15:33:56 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -116 +116 @@
 #include "MGeomPix.h"
 
-#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
 #include "MBadPixelsPix.h"
@@ -718 +717 @@
 
   MCalibrationCam *hilocam = fCam;
-  MBadPixelsCam   *badcam  = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
 
   const Int_t nareas   = fAverageHiGainAreas->GetSize();
@@ -766 +764 @@
 
 
-  FitHiGainArrays(*hilocam,*badcam,
+  FitHiGainArrays(*hilocam, *fBadPixels,
                   MBadPixelsPix::kHiLoNotFitted,
                   MBadPixelsPix::kHiLoOscillating);
@@ -843 +841 @@
   }
 
-  FitLoGainArrays(*hilocam,*badcam,
+  FitLoGainArrays(*hilocam, *fBadPixels,
                   MBadPixelsPix::kHiLoNotFitted,
                   MBadPixelsPix::kHiLoOscillating);
@@ -859 +857 @@
 {
 
-  MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
-
-  for (Int_t i=0; i<badcam->GetSize(); i++)
-    {
-      MBadPixelsPix          &bad    = (*badcam)[i];
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (bad.IsUncalibrated( MBadPixelsPix::kHiLoNotFitted ))