Changeset 4457 for trunk/MagicSoft/Mars/mfileio

Timestamp:

08/04/04 11:37:56 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MCT1ReadPreProc.cc (modified) (10 diffs)
• MCT1ReadPreProc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 11/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -42 +42 @@
 //    MMcTrig         mc data container for trigger information
 //    MSrcPosCam      source position in the camera
-//    MBlindPixels    Array holding blind pixels
+//    MBadPixelsCam   Array holding blind pixels
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -74 +74 @@
 #include "MGeomCam.h"
 #include "MSrcPosCam.h"
-#include "MBlindPixels.h"
+#include "MBadPixelsCam.h"
+#include "MBadPixelsPix.h"
 
 #include "MRawRunHeader.h"
@@ -245 +246 @@
         {
             *fLog << i << " ";
-            fBlinds->SetPixelBlind(i);
+            (*fBlinds)[i].SetUnsuitable(MBadPixelsPix::kUnreliableRun);
         }
     *fLog << endl;
@@ -255 +256 @@
         {
             *fLog << i << " ";
-            fBlinds->SetPixelBlind(i);
+            (*fBlinds)[i].SetUnsuitable(MBadPixelsPix::kUnreliableRun);
         }
     *fLog << endl;
@@ -262 +263 @@
     fBlnd.Set(iMAXNUMPIX);
     for (int i=0; i<iMAXNUMPIX; i++)
-        fBlnd[i] = fBlinds->IsBlind(i) ? 1 : 0;
+        fBlnd[i] = (*fBlinds)[i].IsBad() ? 1 : 0;
 
     fBlinds->SetReadyToSave();
@@ -349 +350 @@
 
     // float   frms_pedsig_phot[iMAXNUMPIX];      // standard deviation of the calibrated signals from the pedestal run */
-    fPedest->InitSize(iMAXNUMPIX);
+    fPedest->Init(*fGeom);
 
     fPedRMS.Set(iMAXNUMPIX);
@@ -775 +776 @@
     //  look for the pedestal class in the plist
     //
-    fBlinds = (MBlindPixels*)pList->FindCreateObj("MBlindPixels");
+    fBlinds = (MBadPixelsCam*)pList->FindCreateObj("MBadPixelsCam");
     if (!fBlinds)
         return kFALSE;
@@ -818 +819 @@
     Rewind();
 
-    fPedest->InitSize(iMAXNUMPIX);
+    fPedest->Init(*fGeom);
 
     return GetSelector() ? GetSelector()->CallPreProcess(pList) : kTRUE;
@@ -901 +902 @@
     fBlinds->Clear();
     for (int i=0; i<iMAXNUMPIX; i++)
-        if ( fBlnd[i]==1 )
-        {
-            fBlinds->SetPixelBlind(i);
-        }
+        if (fBlnd[i]==1)
+            (*fBlinds)[i].SetUnsuitable(MBadPixelsPix::kUnreliableRun);
 
     // reset pedestal RMS for this event

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -22 +22 @@
 class MCerPhotEvt;
 class MPedPhotCam;
-class MBlindPixels;
+class MBadPixelsCam;
 class MRawRunHeader;
 class MTaskList;
@@ -45 +45 @@
     MMcTrig       *fMcTrig;  // mc data container for trigger information
     MSrcPosCam    *fSrcPos;  // source position in the camera
-    MBlindPixels  *fBlinds;  // Array holding blind pixels
+    MBadPixelsCam *fBlinds;  // Array holding blind pixels
     MRawRunHeader *fRawRunHeader; // raw run header
     MParList      *fParList;      // parameter list