Changeset 5398 for trunk

Timestamp:

11/12/04 11:25:10 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mraw/MRawEvtData.cc (modified) (3 diffs)
• mraw/MRawRunHeader.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/11/12: Thomas Bretz
+
+   * mraw/MRawEvtData.cc:
+     - fixed a bug in the initialisation of the arrays (in both
+       cases - hi- and lo-gain - the number of hi gain samples were
+       used
+     - do not try to read lo gains if poslo==NULL
+
+   * mraw/MRawRunHeader.cc:
+     - updated Print()
+
+
+
  2004/11/11: Markus Gaug
 

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -187 +187 @@
     *fLog << dec << all;
     *fLog << GetDescriptor() << ": " << endl;
-    *fLog << "HiGain: " << nHiPix << " Pixels with " << (Int_t)nHiSamp << " Samples  ";
+    *fLog << "HiGain: " << nHiPix << " Pixels with " << (Int_t)nHiSamp << " Samples" << endl;
     *fLog << "LoGain: " << nLoPix << " Pixels with " << (Int_t)nLoSamp << " Samples";
 
@@ -368 +368 @@
 void MRawEvtData::InitArrays(UShort_t numconnected, UShort_t maxid)
 {
-    const Int_t numlo = fRunHeader ? fRunHeader->GetNumSamplesHiGain() : 0;
     const Int_t numhi = fRunHeader ? fRunHeader->GetNumSamplesHiGain() : 0;
+    const Int_t numlo = fRunHeader ? fRunHeader->GetNumSamplesLoGain() : 0;
 
     fHiGainPixId       = new MArrayS(numconnected);
@@ -464 +464 @@
     // Read data for one pixel
     fin.read((char*)poshi, fRunHeader->GetNumSamplesHiGain());
-    fin.read((char*)poslo, fRunHeader->GetNumSamplesLoGain());
-
-    //
-    //  This is to fill the data of one pixel to the MRawEvtHeader Class.
-    //  The parameters are the pixelnumber and the FADC_SLICES values of ADCs
-    //  Add to lo gains if lflag = 1
-    //
     fHiGainPixId->AddAt(npix, fConnectedPixels);
 
-    // FIXME: Not implemented in the raw files yet
-    //if (IsLoGainOn(i, j))
-    //{
-    fLoGainPixId->AddAt(npix, fConnectedPixels);
-    //}
+    if (poslo)
+    {
+        fin.read((char*)poslo, fRunHeader->GetNumSamplesLoGain());
+        // FIXME: Not implemented in the raw files yet
+        //if (IsLoGainOn(i, j))
+        //{
+        fLoGainPixId->AddAt(npix, fConnectedPixels);
+        //}
+    }
 
     if (ab)

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -234 +234 @@
     *fLog << "Run Stop:     " << fRunStop << 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 << "Num Pixels:   " << GetNumNormalPixels() << " (normal) + " << GetNumSpecialPixels() << " (special) = " << GetNumConnectedPixels() << " (total)" << endl;
+    *fLog << "Samples:      " << fNumSamplesHiGain << "/" << fNumSamplesLoGain << " (hi/lo) = " << (fNumSamplesLoGain+fNumSamplesHiGain) * fNumCrates * fNumPixInCrate /1024 << "kB/Evt" << endl;
     *fLog << "Evt Counter:  " << fNumEvents << endl;