Changeset 7579 for trunk/MagicSoft/Mars/mraw

Timestamp:

03/08/06 10:17:07 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawFileRead.cc (modified) (2 diffs)
• MRawFileRead.h (modified) (2 diffs)
• MRawRunHeader.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -102 +102 @@
 //
 MRawFileRead::MRawFileRead(const char *fname, const char *name, const char *title)
-    : fFileNames(NULL), fNumFile(0), fIn(NULL), fParList(NULL), fInterleave(1)
+    : fFileNames(NULL), fNumFile(0), fIn(NULL), fParList(NULL), fInterleave(1), fForce(kFALSE)
 {
     fName  = name  ? name  : "MRead";
@@ -220 +220 @@
     //
     if (!fRawRunHeader->ReadEvt(*fIn))
-        return kERROR;
+        if (!fForce)
+            return kERROR;
 
     if (!(*fIn))

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -24 +24 @@
     UInt_t    fInterleave;
 
+    Bool_t    fForce;
+
     Int_t  OpenNextFile(Bool_t print=kTRUE);
     Bool_t CalcNumTotalEvents();
@@ -38 +40 @@
 
     void SetInterleave(UInt_t i) { fInterleave = i; }
+    void SetForce(Bool_t b=kTRUE) { fForce=b; }
 
     TString GetFullFileName() const;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -362 +362 @@
         return;
 
-    *fLog << inf << hex;
+    *fLog << inf << "Assignment:" << hex << endl;
     for (int i=0; i<GetNumPixel(); i++)
         *fLog << setfill('0') << setw(3) << (*fPixAssignment)[i] << " ";