Changeset 2136

Timestamp:

05/23/03 18:25:35 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/readRfl.C (added)
• mfileio/MCT1ReadPreProc.cc (modified) (1 diff)
• mfileio/MReadRflFile.cc (modified) (12 diffs)
• mfileio/MReadRflFile.h (modified) (4 diffs)
• mreflector/MRflEvtHeader.cc (added)
• mreflector/MRflEvtHeader.h (added)
• mreflector/MRflRunHeader.cc (added)
• mreflector/MRflRunHeader.h (added)
• mreflector/ReflectorLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -42 +42 @@
    * mreflector, mreflector/Makefile, mreflector/ReflectorLinkDef.h,
      mreflector/MRflEvtData.[h,cc], mreflector/MRflSinglePhoton.[h,cc]:
+     mreflector/MRflEvtHeader.[h,cc], mreflector/MRflRunHeader.[h,cc]:
+     - added
+
+   * macros/readRfl.C:
      - added
 

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -914 +914 @@
     // read in the number of cerenkov photons and add the 'new' pixel
     // too the list with it's id, number of photons and error
-    //
-    fNphot->InitSize(iMAXNUMPIX);
-
     // number of photoelectrons measured in each pixel only the
     // actual number of pixels (outputpars.inumpixels) is written out
     // short spixsig_10thphot[iMAXNUMPIX];
-    //*fLog << "spixsig_10thphot : " << endl;
+    //
     for (Int_t i=0; i<iMAXNUMPIX; i++)
     {
-      //*fLog << event.spixsig_10thphot[i] << " ";
-
-      // next 2 statements commented out by WW
-      //if (event.spixsig_10thphot[i]==0)
-      //      continue;
+        // next 2 statements commented out by WW
+        //if (event.spixsig_10thphot[i]==0)
+        //      continue;
 
         fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i],
                          (*fPedest)[i].GetMeanRms());
     }
-    //*fLog << "" << endl;
-
+    fNphot->FixSize();
     fNphot->SetReadyToSave();
 

trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc

@@ -40 +40 @@
 #include "MParList.h"
 #include "MRflEvtData.h"
+#include "MRflEvtHeader.h"
+#include "MRflRunHeader.h"
 
 #include "MLog.h"
@@ -69 +71 @@
         RflEventHeader_old revth;
         fIn->read(&revth, sizeof(RflEventHeader_old));
+        fEvtHeader->SetEvtNumber(revth.EvtNumber);
+//        *fLog << "Event Number: " << revth.EvtNumber;
+//        *fLog << "  Primary ID: " << revth.PrimaryID;
+//        *fLog << "  Run Number: " << revth.RunNumber << endl;
         return (bool)*fIn;
     }
     else
     {
-        RflEventHeader revth_new;
-        fIn->read(&revth_new, sizeof(RflEventHeader));
+        RflEventHeader revth;
+        fIn->read(&revth, sizeof(RflEventHeader));
+        fEvtHeader->SetEvtNumber(revth.EvtNumber);
+//        *fLog << "Event Number: " << revth.EvtNumber;
+//        *fLog << "  Primary ID: " << revth.PrimaryID;
+//        *fLog << "  Run Number: " << revth.RunNumber << endl;
         return (bool)*fIn;
     }
@@ -84 +94 @@
     kStartOfRun,
     kEndOfRun,
-    kStartOfEvt,
-    kEndOfEvt,
+    kStartOfEvtData,
+    kEndOfEvtData,
     kUndefined
 };
@@ -107 +117 @@
         return kStartOfRun;
     if (FlagIsA(flag, FLAG_END_OF_EVENT))
-        return kEndOfEvt;
+        return kEndOfEvtData;
     if (FlagIsA(flag, FLAG_START_OF_EVENT))
-        return kStartOfEvt;
+        return kStartOfEvtData;
 
     return kUndefined;
@@ -134 +144 @@
             break;
 
-        MRflSinglePhoton &ph = fEvt->GetNewPhoton();
+        MRflSinglePhoton &ph = fEvtData->GetNewPhoton();
         ph.SetXY(data.x*10, data.y*10);
         ph.SetCosUV(data.u, data.v);
@@ -142 +152 @@
     }
 
-    fEvt->FixSize();
+    fEvtData->FixSize();
     return rc;
 }
@@ -172 +182 @@
             {
                 *fLog << inf << "FIXME: Call ReInit" << endl;
+
+                fRunHeader->SetRunNumber(rrunh.RunNumber);
+                *fLog << underline << "RunHeader:" << endl;
+                *fLog << " Run Number:   " << rrunh.RunNumber << endl;
+                *fLog << " Date:         " << rrunh.date << endl;
+                *fLog << " Corsika Ver.: " << rrunh.Corsika_version << endl;
+
                 break;
             }
@@ -180 +197 @@
         return kUndefined;
 
-    case kStartOfEvt:
+    case kStartOfEvtData:
     case kEndOfRun:
         break;
@@ -217 +234 @@
             continue;
 
-        case kStartOfEvt:
+        case kStartOfEvtData:
             break;
         }
@@ -231 +248 @@
 Bool_t MReadRflFile::PreProcess(MParList *plist)
 {
-    fEvt=(MRflEvtData*)plist->FindCreateObj("MRflEvtData");
-    if (!fEvt)
+    fEvtData=(MRflEvtData*)plist->FindCreateObj("MRflEvtData");
+    if (!fEvtData)
+        return kFALSE;
+
+    fEvtHeader=(MRflEvtHeader*)plist->FindCreateObj("MRflEvtHeader");
+    if (!fEvtHeader)
+        return kFALSE;
+
+    fRunHeader=(MRflRunHeader*)plist->FindCreateObj("MRflRunHeader");
+    if (!fRunHeader)
         return kFALSE;
 
@@ -334 +359 @@
 }
 
-
-Bool_t MReadRflFile::PostProcess()
-{
-    return kTRUE;
-}
-
 // --------------------------------------------------------------------------
 //
@@ -404 +423 @@
 }
 
+
+Bool_t MReadRflFile::SearchFor(Int_t runno, Int_t eventno)
+{
+    if (!fEvtHeader)
+        return kFALSE;
+
+    fNumFile = 0;
+    if (!OpenNextFile())
+        return kFALSE;
+
+    while (1)
+    {
+        fEvtData->Reset();
+        if (!Process())
+            return kFALSE;
+
+        if (fEvtHeader->GetEvtNumber()==eventno &&
+            fRunHeader->GetRunNumber()==runno)
+            return kTRUE;
+    }
+}

trunk/MagicSoft/Mars/mfileio/MReadRflFile.h

@@ -12 +12 @@
 class TList;
 class MRflEvtData;
+class MRflEvtHeader;
+class MRflRunHeader;
 
 class MReadRflFile : public MRead
@@ -19 +21 @@
     TList    *fFileNames;   // Array which stores the \0-terminated filenames
 
-    MRflEvtData *fEvt;        //!
+    MRflEvtData *fEvtData;        //!
+    MRflEvtHeader *fEvtHeader;
+    MRflRunHeader *fRunHeader;
 
     UInt_t fNumFile;
@@ -36 +40 @@
     Bool_t PreProcess(MParList *pList);
     Bool_t Process();
-    Bool_t PostProcess();
 
 public:
@@ -50 +53 @@
     UInt_t GetEntries() { return fEntries; }
 
+    Bool_t SearchFor(Int_t runno, Int_t eventno);
+
     ClassDef(MReadRflFile, 0) // Reads reflector files
 };

trunk/MagicSoft/Mars/mreflector/ReflectorLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MRflEvtData+;
+#pragma link C++ class MRflEvtHeader+;
+#pragma link C++ class MRflRunHeader+;
 #pragma link C++ class MRflSinglePhoton+;