Changeset 1082 for trunk/MagicSoft/Mars/mraw

Timestamp:

11/15/01 12:06:46 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawCrateArray.cc (modified) (1 diff)
• MRawCrateData.cc (modified) (3 diffs)
• MRawEvtData.cc (modified) (7 diffs)
• MRawEvtHeader.cc (modified) (5 diffs)
• MRawEvtPixelIter.cc (modified) (2 diffs)
• MRawFileRead.cc (modified) (5 diffs)
• MRawFileWrite.cc (modified) (7 diffs)
• MRawRunHeader.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mraw/MRawCrateArray.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001

trunk/MagicSoft/Mars/mraw/MRawCrateData.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -39 +39 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
 
 ClassImp(MRawCrateData);
@@ -64 +65 @@
 void MRawCrateData::Print(Option_t *t) const
 {
-    gLog << "Crate Number " << fDAQCrateNumber << ":  ";
-    gLog << "FADCEventNr=" << fFADCEvtNumber << "  ";
-    gLog << "FADCClockTick=" << fFADCClockTick << " (20MHz)" << endl;
+    *fLog << all;
+    *fLog << "Crate Number " << fDAQCrateNumber << ":  ";
+    *fLog << "FADCEventNr=" << fFADCEvtNumber << "  ";
+    *fLog << "FADCClockTick=" << fFADCClockTick << " (20MHz)" << endl;
 }

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -49 +49 @@
 
 #include "MRawEvtData.h"
-
-#include <iomanip.h>
 
 #include <fstream.h>
@@ -155 +153 @@
     fLog->unsetf(ios::showbase);
 
-    *fLog << dec;
+    *fLog << dec << all;
     *fLog << "HiGain: " << nHiPix << " Pixels with " << (Int_t)nHiSamp << " Samples" << endl;
     *fLog << "LoGain: " << nLoPix << " Pixels with " << (Int_t)nLoSamp << " Samples";;
@@ -213 +211 @@
     if (GetNumPixels()==0)
     {
-        *fLog << "Sorry, no pixel to draw!" << endl;
+        *fLog << warn << "Sorry, no pixel to draw!" << endl;
         return;
     }
@@ -229 +227 @@
             num= GetNumPixels();
 
-        *fLog << "Drawing Graph: Pixel #" << num << " of " << (int)GetNumPixels() << endl;
+        *fLog << inf << "Drawing Graph: Pixel #" << num << " of " << (int)GetNumPixels() << endl;
 
         const Int_t n = GetNumHiGainSamples();
@@ -288 +286 @@
     }
 
-    *fLog << dbginf << "Warning - You must specify either 'GRAPH' or 'HIST'" << endl;
+    *fLog << warn << dbginf << "Warning - You must specify either 'GRAPH' or 'HIST'" << endl;
 }
 
@@ -375 +373 @@
     if (nSamp && ns!=nSamp)
     {
-        *fLog << "RawEvtData::AddPixel: Error, number of samples in ";
+        *fLog << err << "RawEvtData::AddPixel: Error, number of samples in ";
         *fLog << "TArrayC doesn't match actual number" << endl;
         return;

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -99 +99 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
+
 #include "MTime.h"
 #include "MArrayB.h"
@@ -117 +119 @@
     //   set all member to zero, init the pointer to ClonesArray,
     //
-
     fPixLoGainOn = new MArrayB;
 
@@ -180 +181 @@
 void MRawEvtHeader::Print(Option_t *o) const
 {
+    *fLog << all;
     *fLog << "DAQEvtNr: " << dec << fDAQEvtNumber << "  (";
     *fLog << "Trigger: ";
@@ -214 +216 @@
 
     *fLog << endl;
-
     *fLog << endl;
-
 }
 

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -143 +143 @@
 void MRawEvtPixelIter::Draw(Option_t *t)
 { 
-  char *txt = new char[6+strlen(t)];
-  sprintf(txt, "%s%d", t, *fHiGainId);
-  fData->Draw(txt);
-  delete txt; 
+    fData->Draw(Form("%s%d", t, *fHiGainId));
 }
 

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -44 +44 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
+
 #include "MTime.h"
 #include "MParList.h"
@@ -92 +94 @@
 //
 MRawFileRead::MRawFileRead(const char *fname, const char *name, const char *title)
-    : fFileName(fname)
+    : fFileName(fname), fIn(NULL)
 {
     fName  = name  ? name  : "MRawFileRead";
     fTitle = title ? title : "Read task to read DAQ binary files";
 
-    //
-    // open the input stream
-    //
-    fFileName = fname;
-    fIn = new ifstream(fname);
+    fIn = new ifstream;
 }
 
@@ -132 +130 @@
 {
     //
+    // open the input stream
     // first of all check if opening the file in the constructor was
     // successfull
     //
+    fIn->open(fFileName);
     if (!(*fIn))
     {
-        *fLog << "Error: Cannot open file '" << fFileName << "'" << endl;
+        *fLog << err << "Error: Cannot open file '" << fFileName << "'" << endl;
         return kFALSE;
     }
@@ -231 +231 @@
 // --------------------------------------------------------------------------
 //
-//  Checks whether the number of read events differs from the number the
-//  file should containe (MRawRunHeader). Prints a warning if it doesn't
-//  match.
+//  Close the file. Check whether the number of read events differs from
+//  the number the file should containe (MRawRunHeader). Prints a warning
+//  if it doesn't match.
 //
 Bool_t MRawFileRead::PostProcess()
 {
+    //
+    // Sanity check for the number of events
+    //
     if (fRawRunHeader->GetNumEvents() == GetNumExecutions()-1)
         return kTRUE;
 
-    *fLog << "WARNING - number of read events (" << GetNumExecutions()-1;
+    *fLog << warn << "Warning - number of read events (" << GetNumExecutions()-1;
     *fLog << ") doesn't match number in run header (";
     *fLog << fRawRunHeader->GetNumEvents() << ")." << endl;

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -130 +130 @@
     if (!fRawEvtHeader)
     {
-        *fLog << dbginf << "MRawEvtHeader not found... aborting." << endl;
+        *fLog << err << dbginf << "MRawEvtHeader not found... aborting." << endl;
         return kFALSE;
     }
@@ -137 +137 @@
     if (!fRawEvtData)
     {
-        *fLog << dbginf << "MRawEvtData not found... aborting." << endl;
+        *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
         return kFALSE;
     }
@@ -144 +144 @@
     if (!fRawCrateArray)
     {
-        *fLog << dbginf << "MRawCrateArray not found... aborting." << endl;
+        *fLog << err << dbginf << "MRawCrateArray not found... aborting." << endl;
         return kFALSE;
     }
@@ -151 +151 @@
     if (!fRawEvtTime)
     {
-        *fLog << dbginf << "MRawEvtTime not found... aborting." << endl;
+        *fLog << err << dbginf << "MRawEvtTime not found... aborting." << endl;
         return kFALSE;
     }
@@ -158 +158 @@
     if (!fRawRunHeader)
     {
-        *fLog << dbginf << "MRawRunHeader not found... aborting." << endl;
+        *fLog << err << dbginf << "MRawRunHeader not found... aborting." << endl;
         return kFALSE;
     }
@@ -254 +254 @@
     }
 
-    *fLog << dbginf << "Got wrong number for the trigger type: " << type;
-    *fLog << "  - skipping" << endl;
+    *fLog << warn << dbginf << "Got wrong number for the trigger type: " << type;
+    *fLog << " - skipped" << endl;
 
     return kCONTINUE;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -37 +37 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
+
 #include "MArrayS.h"
 
@@ -79 +81 @@
     if (fMagicNumber != kMagicNumber)
     {
-        *fLog << "Error: Wrong Magic Number: Not a Magic File!" << endl;
+        *fLog << err << "Error: Wrong Magic Number: Not a Magic File!" << endl;
         return;
     }
@@ -122 +124 @@
 void MRawRunHeader::Print(Option_t *t) const
 {
-    *fLog << endl;
+    *fLog << all << endl;
     *fLog << "MagicNumber:  0x" << hex << fMagicNumber << " - " << (fMagicNumber==kMagicNumber?"OK":"Wrong!") << endl;
     *fLog << "Version:      " << dec << "Format=" << fFormatVersion << "  ";