Changeset 1849

Timestamp:

03/21/03 09:32:12 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MCT1ReadPreProc.cc (modified) (9 diffs)
• MCT1ReadPreProc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -337 +337 @@
     // float   frms_pedsig_phot[iMAXNUMPIX];      // standard deviation of the calibrated signals from the pedestal run */
     fPedest->InitSize(iMAXNUMPIX);
+
+    fPedRMS.Set(iMAXNUMPIX);
+
     *fLog << "PedestalRMS : ";
     for (Int_t i=0; i<iMAXNUMPIX; i++)
@@ -342 +345 @@
         (*fPedest)[i].SetMeanRms(outpars.frms_pedsig_phot[i]);
         *fLog << outpars.frms_pedsig_phot[i] << " "; 
- 
-        //$$$$$$$$$$$$$$$$$$$$$$$$$
-        savePedRMS[i] =  outpars.frms_pedsig_phot[i];
-        //$$$$$$$$$$$$$$$$$$$$$$$$$
+        fPedRMS[i] =  outpars.frms_pedsig_phot[i];
     }
     *fLog << endl;
@@ -383 +383 @@
      *         be treated further. */
 
-    *fLog << "outpars.bmontecarlo = " << outpars.bmontecarlo << endl;
-    *fLog << "outpars.imcparticle = " << outpars.imcparticle << endl;
-    *fLog << "outpars.dsourcera_hours = " << outpars.dsourcera_hours << endl;
-    *fLog << "outpars.dsourcedec_deg = " << outpars.dsourcedec_deg << endl;
-
-    //*fLog << "File is a ";
-    //*fLog << (outpars.bmontecarlo ? "Monte Carlo" : "Real Data");
-    //*fLog << " file." << endl;
-
+    *fLog << "Particle Id #" << outpars.imcparticle << endl;
+    *fLog << "Right Ascension: " << outpars.dsourcera_hours << "h" << endl;
+    *fLog << "Declination: " << outpars.dsourcedec_deg << "deg" << endl;
 
     // Next statement commented out because bmontecarlo was set wrongly
@@ -399 +393 @@
                  outpars.imcparticle != 0          );
 
-    *fLog << "File is a ";
+    if (fIsMcFile != (outpars.bmontecarlo==TRUE))
+    {
+        *fLog << "File tells you that it is a ";
+        *fLog << (outpars.bmontecarlo ? "Monte Carlo" : "Real Data");
+        *fLog << " file." << endl;
+    }
+
+    *fLog << "File detected as a ";
     *fLog << (fIsMcFile ? "Monte Carlo" : "Real Data");
     *fLog << " file." << endl;
@@ -579 +580 @@
 
     switch (ReadRunHeader())
-      {
-      case kFALSE:
-        *fLog << warn << "Unable to read first run header... skipping file." << endl;
-        return kFALSE;
-      case -1:
-        *fLog << warn << "ReInit of Tasklist didn't succeed." << endl;
-        return kFALSE;
-      default:
-        *fLog << "OpenNextFile : after ReadRunHeader, FnumEventsInRun = " 
-              << fNumEventsInRun << endl;
+    {
+    case kFALSE:
+        *fLog << warn << "Unable to read first run header... skipping file." << endl;
+        return kFALSE;
+    case -1:
+        *fLog << warn << "ReInit of Tasklist didn't succeed." << endl;
+        return kFALSE;
+    default:
+        *fLog << "After opening next file: Number of Events #" << fNumEventsInRun << endl;
         return kTRUE;
-      }
-
-
-
+    }
 }
 
@@ -807 +804 @@
 
     for (Int_t i=0; i<iMAXNUMPIX; i++)
-    {
-        (*fPedest)[i].SetMeanRms(savePedRMS[i]);
-    }
-
+        (*fPedest)[i].SetMeanRms(fPedRMS[i]);
 
     //  int   isecs_since_midday; // seconds passed since midday before sunset (JD of run start)
@@ -932 +926 @@
         // an event
         //
-
-      // "goto TONI" was introduced in order to check for a footer record
-      // after reading a run header; this is necessary for runs with
-      // zero events after the filter
-      TONI:
-
-      if (fIn->peek()!=cEND_EVENTS_TEMPLATE[0])
+        if (fIn->peek()!=cEND_EVENTS_TEMPLATE[0])
             return kTRUE;
 
@@ -945 +933 @@
         // must be an event
         //
-
         switch (ReadRunFooter())
         {
@@ -984 +971 @@
             return kFALSE;
         }
-
-        goto TONI;
-
-        return kTRUE;
     }
 }

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -1 +1 @@
 #ifndef MARS_MCT1ReadPreProc
 #define MARS_MCT1ReadPreProc
+
+#ifndef ROOT_TArrayF
+#include <TArrayF.h>
+#endif
 
 #ifndef MARS_MRead
@@ -36 +40 @@
     MSrcPosCam    *fSrcPos;  // source position in the camera
     MBlindPixels  *fBlinds;  // Array holding blind pixels
-    MRawRunHeader *fRawRunHeader;  // raw run header
-    MTaskList     *fTaskList; // task list
-    MParList      *fParList; // parameter list
+    MRawRunHeader *fRawRunHeader; // raw run header
+    MParList      *fParList;      // parameter list
 
     Bool_t fIsMcFile;       // Flag whether current run is a MC run
@@ -48 +51 @@
     UInt_t fNumFilterEvts;  // number of events mentioned in the runs footers
 
-    Float_t savePedRMS[127];
+    TArrayF fPedRMS;