Changeset 609 for trunk/MagicSoft/Mars/mraw

Timestamp:

02/22/01 14:30:10 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawCrateArray.cc (modified) (2 diffs)
• MRawEvtData.cc (modified) (6 diffs)
• MRawEvtHeader.cc (modified) (3 diffs)
• MRawFileRead.cc (modified) (7 diffs)
• MRawFileWrite.cc (modified) (7 diffs)
• MRawRunHeader.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mraw/MRawCrateArray.cc

@@ -12 +12 @@
 #include "MRawCrateArray.h"
 
-#include <iostream.h>
+#include <TClonesArray.h>
 
-#include <TClonesArray.h>
+#include "MLog.h"
 
 ClassImp(MRawCrateArray)
@@ -45 +45 @@
 void MRawCrateArray::Print(Option_t *opt)
 {
-    cout << "MRawCrateArray::Print()" << endl;
+    *fLog << "MRawCrateArray::Print()" << endl;
 }
 

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -26 +26 @@
 #include "MRawEvtData.h"
 
-#include <iostream.h>
 #include <iomanip.h>
 
@@ -35 +34 @@
 #include <TArrayC.h>
 
+#include "MLog.h"
 #include "MArrayS.h"
 #include "MArrayB.h"
@@ -87 +87 @@
 
 
-void MRawEvtData::Print(Option_t *)
+void MRawEvtData::Print(Option_t *opt)
 {
     //
     // print fadc inforation to screen
+    // Possible Options:
+    // - DEC: Print values decimal instead of hexadecimal (default)
     //
     const Byte_t nHiSamp = GetNumHiGainSamples();
@@ -98 +100 @@
     const UShort_t nLoPix = fLoGainPixId->GetSize();;
 
-    cout << dec;
-    cout << "HiGain: " << nHiPix << " Pixels with " << (Int_t)nHiSamp << " Samples" << endl;
-    cout << "LoGain: " << nLoPix << " Pixels with " << (Int_t)nLoSamp << " Samples" << endl;
+    fLog->unsetf(ios::showbase);
+
+    *fLog << dec;
+    *fLog << "HiGain: " << nHiPix << " Pixels with " << (Int_t)nHiSamp << " Samples" << endl;
+    *fLog << "LoGain: " << nLoPix << " Pixels with " << (Int_t)nLoSamp << " Samples";;
+
+    TString str(opt);
+    Int_t manip = str.Contains("dec", TString::kIgnoreCase);
 
     Int_t l=0;
     for (int i=0; i<nHiPix; i++)
     {
-        cout << " " << setfill(' ') << setw(3) << i << ": " << hex << flush;
-
-        cout << setfill('0');
+        *fLog << endl;
+        *fLog << " " << setfill(' ') << setw(3) << dec << i << ": ";
+        *fLog << (manip?dec:hex) << flush;
+
+        if (!manip)
+            *fLog << setfill('0');
 
         for (int j=0; j<nHiSamp; j++)
-            cout << setw(2)
-                << ((UShort_t)(*fHiGainFadcSamples)[j+i*nHiSamp]&0xff) << flush;
-
-        if (l<nLoPix && (*fLoGainPixId)[l]==(*fHiGainPixId)[i])
         {
-            for (int j=0; j<nLoSamp; j++)
-                cout << setw(2)
-                    <<((UShort_t)(*fLoGainFadcSamples)[j+i*nLoSamp]&0xff) << flush;
-            l++;
+            *fLog << setw(manip?3:2);
+            *fLog << ((UShort_t)(*fHiGainFadcSamples)[j+i*nHiSamp]&0xff);
+            if (manip)
+                *fLog << ' ';
+            *fLog << flush;
         }
-        cout << dec << endl;
+
+        if (!(l<nLoPix && (*fLoGainPixId)[l]==(*fHiGainPixId)[i]))
+            continue;
+
+        if (manip)
+            *fLog << "/ ";
+
+        for (int j=0; j<nLoSamp; j++)
+        {
+            *fLog << setw(manip?3:2);
+            *fLog << ((UShort_t)(*fLoGainFadcSamples)[j+i*nLoSamp]&0xff);
+            if (manip)
+                *fLog << ' ';
+            *fLog << flush;
+        }
+        l++;
     }
-    cout << endl;
+    *fLog << endl;
 }
 
@@ -135 +157 @@
   if (str.BeginsWith("GRAPH", TString::kIgnoreCase))
   {
-    if (str.Length()>5)
-      sscanf(&str[5], "%d", &num);
-    
-    if (num>=GetNumPixels())
-      num= GetNumPixels();
-    
-    cout << "Drawing Graph of Pixel " << num << endl;
-    
-    const Int_t n = GetNumHiGainSamples();
-    
-    Float_t *x = new Float_t[n];
-    Float_t *y = new Float_t[n];
-    
-    for (int i=0; i<n; i++)
-    {
-      x[i] = i;
-      y[i] = (*fHiGainFadcSamples)[i + num*GetNumHiGainSamples()];
-    }
-    
-    TGraph *graph = new TGraph(n, x, y);
-    graph->SetMaximum (256) ; 
-    graph->SetMinimum (0) ; 
-    
-    graph->Draw("AC*");
-    
-    return;
+      if (str.Length()>5)
+          sscanf(&str[5], "%d", &num);
+
+      if (num>=GetNumPixels())
+          num= GetNumPixels();
+
+      *fLog << "Drawing Graph of Pixel " << num << endl;
+
+      const Int_t n = GetNumHiGainSamples();
+
+      Float_t *x = new Float_t[n];
+      Float_t *y = new Float_t[n];
+
+      for (int i=0; i<n; i++)
+      {
+          x[i] = i;
+          y[i] = (*fHiGainFadcSamples)[i + num*GetNumHiGainSamples()];
+      }
+
+      TGraph *graph = new TGraph(n, x, y);
+      graph->SetMaximum (256) ;
+      graph->SetMinimum (0) ;
+
+      graph->Draw("AC*");
+
+      return;
   }
-  
+
   if (str.BeginsWith("HIST", TString::kIgnoreCase))
   {
-    cout << "Length: " << str.Length() << endl;
-    
-    if (str.Length()>4)
-      sscanf(&str[4], "%d", &num);
-    
-    if (num>=GetNumPixels())
-      num= GetNumPixels();
-    
-    cout << "Drawing Histogram of Pixel " << num << endl;
-    
-    const Int_t n = GetNumHiGainSamples();
-    
-    char *name = new char[16];
-    
-    sprintf(name, "Pixel No.%d", (*fHiGainPixId)[num]);
-    
-    TH1F *hist = new TH1F(name, "Hi Gain Samples FADC", n, 0, n);
-    
-    for (int i=0; i<n; i++)
-      hist->Fill(0.5+i, (*fHiGainFadcSamples)[i + num*GetNumHiGainSamples()]);
-    
-    hist->Draw();
-
-    return;
+      *fLog << "Length: " << str.Length() << endl;
+
+      if (str.Length()>4)
+          sscanf(&str[4], "%d", &num);
+
+      if (num>=GetNumPixels())
+          num= GetNumPixels();
+
+      *fLog << "Drawing Histogram of Pixel " << num << endl;
+
+      const Int_t n = GetNumHiGainSamples();
+
+      char *name = new char[16];
+
+      sprintf(name, "Pixel No.%d", (*fHiGainPixId)[num]);
+
+      TH1F *hist = new TH1F(name, "Hi Gain Samples FADC", n, 0, n);
+
+      for (int i=0; i<n; i++)
+          hist->Fill(0.5+i, (*fHiGainFadcSamples)[i + num*GetNumHiGainSamples()]);
+
+      hist->Draw();
+
+      return;
   }
-  
-  cout << "MRawEvtData::Draw: Warning: You must specify either 'GRAPH' or 'HIST'" << endl;
+
+  *fLog << "MRawEvtData::Draw: Warning: You must specify either 'GRAPH' or 'HIST'" << endl;
 }
 
@@ -238 +260 @@
     if (nSamp && ns!=nSamp)
     {
-        cout << "RawEvtData::FillPixel: Error, number of samples in ";
-        cout << "TArrayC doesn't match actual number" << endl;
+        *fLog << "RawEvtData::FillPixel: Error, number of samples in ";
+        *fLog << "TArrayC doesn't match actual number" << endl;
         return;
     }

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -71 +71 @@
 #include "MRawEvtHeader.h"
 
-#include <iostream.h>
 #include <iomanip.h>
 #include <fstream.h>
 
+#include "MLog.h"
 #include "MTime.h"
 #include "MArrayB.h"
@@ -145 +145 @@
     //  This member function prints all Data of one Event on screen.
     //
-    cout << "DAQEvtNr: " << dec << fDAQEvtNumber << "  (";
-    cout << "Trigger: ";
-    cout << "NumLvl1=" << fNumTrigLvl1 << " ";
-    cout << "NumLvl2=" << fNumTrigLvl2 << " ";
-    cout << "Pattern=" << hex << setfill('0');
-    cout << setw(2) << fTrigPattern[0];
-    cout << setw(2) << fTrigPattern[1] << " " << dec;
-
-    cout << "Type=";
+    *fLog << "DAQEvtNr: " << dec << fDAQEvtNumber << "  (";
+    *fLog << "Trigger: ";
+    *fLog << "NumLvl1=" << fNumTrigLvl1 << " ";
+    *fLog << "NumLvl2=" << fNumTrigLvl2 << " ";
+    *fLog << "Pattern=" << hex << setfill('0');
+    *fLog << setw(2) << fTrigPattern[0];
+    *fLog << setw(2) << fTrigPattern[1] << " " << dec;
+
+    *fLog << "Type=";
     switch (fTrigType)
     {
     case 0:
-        cout << "Trigger";
+        *fLog << "Trigger";
         break;
     case 1:
-        cout << "Pedestal";
+        *fLog << "Pedestal";
         break;
     case 2:
-        cout << "Calibration";
+        *fLog << "Calibration";
         break;
     }
-    cout << ")" << endl;
-    cout << "Number of Lo Gains On: " << fNumLoGainOn << endl;
+    *fLog << ")" << endl;
+    *fLog << "Number of Lo Gains On: " << fNumLoGainOn << endl;
 
     for (int i=0; i<fPixLoGainOn->GetSize(); i++)
@@ -174 +174 @@
         {
             const UInt_t on = (*fPixLoGainOn)[i]&(1<<j) ? 1 : 0;
-            cout << on;
+            *fLog << on;
         }
     }
 
-    cout << endl;
-
-    cout << endl;
+    *fLog << endl;
+
+    *fLog << endl;
 
 }

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -11 +11 @@
 #include "MRawFileRead.h"
 
-#include <iostream.h>
 #include <fstream.h>
 
+#include "MLog.h"
 #include "MTime.h"
 #include "MParList.h"
@@ -34 +34 @@
     fIn = new ifstream(fname);
 
-    /*
-     FIXME: How can I test whether the construction of
-            the instance was successfull?
-    if (!fIn->is_open())
-    cout << "Error: Trying to open file '" << fname << "'" << endl;
-    */
+    if (!(*fIn))
+        *fLog << "Error: Trying to open file '" << fname << "'" << endl;
 }
 
@@ -56 +52 @@
     if (!fRawRunHeader)
     {
-        cout << "MRawFileRead::PreProcess - WARNING: MRawRunHeader not found... creating." << endl;
+        *fLog << "MRawFileRead::PreProcess - WARNING: MRawRunHeader not found... creating." << endl;
         fRawRunHeader = new MRawRunHeader;
         pList->AddToList(fRawRunHeader);
@@ -64 +60 @@
     if (!fRawEvtHeader)
     {
-        cout << "MRawFileRead::PreProcess - WARNING: MRawEvtHeader not found... creating." << endl;
+        *fLog << "MRawFileRead::PreProcess - WARNING: MRawEvtHeader not found... creating." << endl;
         fRawEvtHeader = new MRawEvtHeader;
         pList->AddToList(fRawEvtHeader);
@@ -72 +68 @@
     if (!fRawEvtData)
     {
-        cout << "MRawFileRead::PreProcess - WARNING: MRawEvtData not found... creating." << endl;
+        *fLog << "MRawFileRead::PreProcess - WARNING: MRawEvtData not found... creating." << endl;
         fRawEvtData = new MRawEvtData;
         pList->AddToList(fRawEvtData);
@@ -80 +76 @@
     if (!fRawCrateArray)
     {
-        cout << "MRawFileRead::PreProcess - WARNING: MRawCrateArray not found... creating." << endl;
+        *fLog << "MRawFileRead::PreProcess - WARNING: MRawCrateArray not found... creating." << endl;
         fRawCrateArray = new MRawCrateArray;
         pList->AddToList(fRawCrateArray);
@@ -88 +84 @@
     if (!fRawEvtTime)
     {
-        cout << "MRawFileRead::PreProcess - WARNING: MRawEvtTime not found... creating." << endl;
+        *fLog << "MRawFileRead::PreProcess - WARNING: MRawEvtTime not found... creating." << endl;
         fRawEvtTime = new MTime("MRawEvtTime");
         pList->AddToList(fRawEvtTime);

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -10 +10 @@
 #include "MRawFileWrite.h"
 
-#include <iostream.h>
-
 #include <TFile.h>
 #include <TTree.h>
 #include <TBranch.h>
 
+#include "MLog.h"
 #include "MParList.h"
 #include "MRawRunHeader.h"
@@ -43 +42 @@
     if (!fOut->IsOpen())
     {
-        cout << "MRawFileWrite::MRawFileWrite: ERROR: Cannot open file '";
-        cout << fname << "'" << endl;
+        *fLog << "MRawFileWrite::MRawFileWrite: ERROR: Cannot open file '";
+        *fLog << fname << "'" << endl;
     }
 }
@@ -62 +61 @@
     if (!fRawEvtHeader)
     {
-        cout << "MRawFileWrite::PreProcess - ERROR: MRawEvtHeader not found... aborting." << endl;
+        *fLog << "MRawFileWrite::PreProcess - ERROR: MRawEvtHeader not found... aborting." << endl;
         return kFALSE;
     }
@@ -69 +68 @@
     if (!fRawEvtData)
     {
-        cout << "MRawFileWrite::PreProcess - ERROR: MRawEvtData not found... aborting." << endl;
+        *fLog << "MRawFileWrite::PreProcess - ERROR: MRawEvtData not found... aborting." << endl;
         return kFALSE;
     }
@@ -76 +75 @@
     if (!fRawCrateArray)
     {
-        cout << "MRawFileWrite::PreProcess - ERROR: MRawCrateArray not found... aborting." << endl;
+        *fLog << "MRawFileWrite::PreProcess - ERROR: MRawCrateArray not found... aborting." << endl;
         return kFALSE;
     }
@@ -83 +82 @@
     if (!fRawEvtTime)
     {
-        cout << "MRawFileWrite::PreProcess - WARNING: MRawEvtTime not found... aborting." << endl;
+        *fLog << "MRawFileWrite::PreProcess - WARNING: MRawEvtTime not found... aborting." << endl;
         return kFALSE;
     }
@@ -90 +89 @@
     if (!fRawRunHeader)
     {
-        cout << "MRawFileWrite::PreProcess - ERROR: MRawRunHeader not found... aborting." << endl;
+        *fLog << "MRawFileWrite::PreProcess - ERROR: MRawRunHeader not found... aborting." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -12 +12 @@
 #include <iomanip.h>
 
-//#include <TClass.h>
-
+#include "MLog.h"
 #include "MArrayS.h"
 
@@ -46 +45 @@
     if (fMagicNumber != kMagicNumber)
     {
-        cout << "Error: Wrong Magic Number: Not a Magic File!" << endl;
+        *fLog << "Error: Wrong Magic Number: Not a Magic File!" << endl;
         return;
     }
@@ -88 +87 @@
     // print run header information on screen
     //
-    cout << "MagicNumber:  0x" << hex << fMagicNumber << " - " << (fMagicNumber==0xc0c0?"OK":"Wrong!") << endl;
-    cout << "Version:      " << dec << "Format=" << fFormatVersion << "  ";
-    cout << "Software=" << fSoftVersion << endl;
-    cout << "RunNumber:    " << fRunNumber << " (Type=";
+    *fLog << "MagicNumber:  0x" << hex << fMagicNumber << " - " << (fMagicNumber==0xc0c0?"OK":"Wrong!") << endl;
+    *fLog << "Version:      " << dec << "Format=" << fFormatVersion << "  ";
+    *fLog << "Software=" << fSoftVersion << endl;
+    *fLog << "RunNumber:    " << fRunNumber << " (Type=";
     switch (fRunType)
     {
     case 0:
-        cout << "Data";
+        *fLog << "Data";
         break;
     case 1:
-        cout << "Pedestal";
+        *fLog << "Pedestal";
         break;
     case 2:
-        cout << "Calibration";
+        *fLog << "Calibration";
         break;
     }
-    cout << ")" << endl;
-    cout << "ProjectName: '" << fProjectName << "'" << endl;
-    cout << "Source:      '" << fSourceName << "' " << "  ";
-    cout << fSourceEpochChar << dec << fSourceEpochDate << endl;
-    cout << "Date:         " << setprecision(1) << setiosflags(ios::fixed) << fMJD << " (MJD)  " << fDateYear << "/" << fDateMonth << "/" << fDateDay << endl;
-    cout << "Crates:       " << fNumCrates << " x " << fNumPixInCrate << " Pixel/Crate = " << fNumCrates*fNumPixInCrate << " Pixel/Evt" << endl;
-    cout << "Samples:      " << fNumSamplesLoGain << "/" << fNumSamplesHiGain << " (lo/hi) = " << (fNumSamplesLoGain+fNumSamplesHiGain) * fNumCrates * fNumPixInCrate /1024 << "kB/Evt" << endl;
-    cout << "Evt Counter:  " << fNumEvents << endl;
+    *fLog << ")" << endl;
+    *fLog << "ProjectName: '" << fProjectName << "'" << endl;
+    *fLog << "Source:      '" << fSourceName << "' " << "  ";
+    *fLog << fSourceEpochChar << dec << fSourceEpochDate << endl;
+    *fLog << "Date:         " << setprecision(1) << setiosflags(ios::fixed) << fMJD << " (MJD)  " << fDateYear << "/" << fDateMonth << "/" << fDateDay << endl;
+    *fLog << "Crates:       " << fNumCrates << " x " << fNumPixInCrate << " Pixel/Crate = " << fNumCrates*fNumPixInCrate << " Pixel/Evt" << endl;
+    *fLog << "Samples:      " << fNumSamplesLoGain << "/" << fNumSamplesHiGain << " (lo/hi) = " << (fNumSamplesLoGain+fNumSamplesHiGain) * fNumCrates * fNumPixInCrate /1024 << "kB/Evt" << endl;
+    *fLog << "Evt Counter:  " << fNumEvents << endl;
 
-    cout << hex;
+    *fLog << hex;
     for (int i=0; i<GetNumPixel(); i++)
-        cout << setfill('0') << setw(3) << (*fPixAssignment)[i] << " ";
-    cout << hex << endl;
+        *fLog << setfill('0') << setw(3) << (*fPixAssignment)[i] << " ";
+    *fLog << hex << endl;
 
-    cout << endl;
+    *fLog << endl;
 }