Changeset 7579

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mraw/MRawFileRead.cc (modified) (2 diffs)
• mraw/MRawFileRead.h (modified) (2 diffs)
• mraw/MRawRunHeader.cc (modified) (1 diff)
• readdaq.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/03/08 Thomas Bretz
+
+   * readdaq.cc, mraw/MRawFileRead.[h,cc], mraw/MRawRunHeader.cc:
+     - added new force-option to foirce output of run-header
+
+
+
  2006/03/08 Daniela Dorner
 
@@ -44 +51 @@
 
 
- 2006/03/08 Thomas Bretz
-
+ 2006/03/07 Thomas Bretz
+ 
    * mcalib/MCalibrateData.cc:
      - take the bad pixel information into account when calculating the
        number of saturating pixels!
+
 
 

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] << " ";

trunk/MagicSoft/Mars/readdaq.cc

@@ -53 +53 @@
     gLog << "     -d1: print data in decimal values" << endl;
     gLog << "     -c1: print MRawCrateArray data" << endl;
+    gLog << "     -f:  force reading of runheader" << endl;
     gLog << "     -?, -h, --help: This help" << endl << endl;
 }
@@ -77 +78 @@
     const bool kDecimal    = arg.HasOption("-d") && arg.GetIntAndRemove("-d")==1;
     const bool kPrintArray = arg.HasOption("-c") && arg.GetIntAndRemove("-c")==1;
+    const bool kForce      = arg.HasOnlyAndRemove("-f");
 
     //
@@ -152 +154 @@
     //
     MRawFileRead read(kNamein);
+    read.SetForce(kForce);
     tasks.AddToList(&read);
 
     MPrint print0;
-    MPrint print1("MRawEvtHeader",  "nogains", "PrintEvtHeader");
-    MPrint print2("MTime",          "", "PrintTime");
-    MPrint print3("MRawCrateArray", "", "PrintCrateArray");
-    MPrint print4("MRawEvtData", kDecimal?"dec":"hex", "PrintEvtData");
-    MPrint print5("MRawEvtData2", kDecimal?"dec":"hex", "PrintEvtData2");
+    MPrint print1("MRawEvtHeader",  "nogains",            "PrintEvtHeader");
+    MPrint print2("MTime",          "",                   "PrintTime");
+    MPrint print3("MRawCrateArray", "",                   "PrintCrateArray");
+    MPrint print4("MRawEvtData",    kDecimal?"dec":"hex", "PrintEvtData");
+    MPrint print5("MRawEvtData2",   kDecimal?"dec":"hex", "PrintEvtData2");
 
     tasks.AddToList(&print0);