Changeset 2152 for trunk/MagicSoft/Mars/mfileio

Timestamp:

06/03/03 08:21:45 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

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

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -234 +234 @@
 
     // Boolean bdontusepix[iMAXNUMPIX]; // bdontusepix is set true if the pixel should not be used in image analysis, otherwise it is true;
+
     fBlinds->Clear();
     *fLog << "Don't use pixels: ";
@@ -245 +246 @@
 
     *fLog << "Exclude pixels: ";
-
     // Boolean bexcludepix[iMAXNUMPIX];
     for (int i=0; i<iMAXNUMPIX; i++)
@@ -254 +254 @@
         }
     *fLog << endl;
+
+    // save blind pixels for all events of this run
+    fBlnd.Set(iMAXNUMPIX);
+    for (int i=0; i<iMAXNUMPIX; i++)
+    {
+        if ( fBlinds->IsBlind(i) )
+        {
+          fBlnd[i] = 1;
+        }
+        else
+        {
+          fBlnd[i] = 0;
+        }
+    }
 
     fBlinds->SetReadyToSave();
@@ -881 +895 @@
     */
 
+    // reset blind pixels for this event
+    fBlinds->Clear();
+    for (int i=0; i<iMAXNUMPIX; i++)
+        if ( fBlnd[i]==1 )
+        {
+            fBlinds->SetPixelBlind(i);
+        }
+
+    // reset pedestal RMS for this event
     for (Int_t i=0; i<iMAXNUMPIX; i++)
         (*fPedest)[i].SetMeanRms(fPedRMS[i]);
@@ -1108 +1131 @@
     struct eventrecord event;
 
+
+
     // read the eventrecord from the file
     fIn->read((Byte_t*)&event, sizeof(struct eventrecord));

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -4 +4 @@
 #ifndef ROOT_TArrayF
 #include <TArrayF.h>
+#endif
+
+#ifndef ROOT_TArrayI
+#include <TArrayI.h>
 #endif
 
@@ -58 +62 @@
 
     TArrayF fPedRMS;
+    TArrayI fBlnd;
 
     Bool_t OpenNextFile();