Changeset 1031 for trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

Timestamp:

11/06/01 10:33:21 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mraw/MRawEvtData.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -138 +138 @@
 //     "dec"      Prints the time slices decimal
 //
-void MRawEvtData::Print(Option_t *opt)
+void MRawEvtData::Print(Option_t *opt) const
 {
     //
@@ -296 +296 @@
 void MRawEvtData::DeletePixels(Bool_t flag)
 {
+    const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
+
+    if (fArraySize == npix && flag)
+    {
+        fPosInArray = 0;
+        return;
+    }
+
     DeleteArrays();
     InitArrays(flag);
@@ -319 +327 @@
 void MRawEvtData::InitArrays(Bool_t flag)
 {
-    // const int npix = !flag ? 0 : fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
-
-    fHiGainPixId       = new MArrayS(0);//npix);
-    fLoGainPixId       = new MArrayS(0);//npix); 
-    fHiGainFadcSamples = new MArrayB(0);//npix*fRunHeader->GetNumSamplesHiGain());
-    fLoGainFadcSamples = new MArrayB(0);//npix*fRunHeader->GetNumSamplesLoGain());
+    if (flag)
+    {
+        const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
+
+        fHiGainPixId       = new MArrayS(npix);
+        fLoGainPixId       = new MArrayS(npix);
+        fHiGainFadcSamples = new MArrayB(npix*fRunHeader->GetNumSamplesHiGain());
+        fLoGainFadcSamples = new MArrayB(npix*fRunHeader->GetNumSamplesLoGain());
+
+        fArraySize  = npix;
+    }
+    else
+    {
+        fHiGainPixId       = new MArrayS(0);
+        fLoGainPixId       = new MArrayS(0);
+        fHiGainFadcSamples = new MArrayB(0);
+        fLoGainFadcSamples = new MArrayB(0);
+
+        fArraySize = 0;
+    }
+
+    fPosInArray = 0;
 }
 
@@ -384 +408 @@
     const UShort_t npic = fRunHeader->GetNumPixInCrate();
 
-    //
-    // Enhance array by the size which we'll read now
-    //
-    const int npixhi = fHiGainPixId->GetSize();
-    const int npixlo = fLoGainPixId->GetSize();
-
-    fHiGainPixId->Set(npixhi+npic);
-    fLoGainPixId->Set(npixlo+npic);
-
-    const int nsamhi = fHiGainFadcSamples->GetSize();
-    const int nsamlo = fLoGainFadcSamples->GetSize();
-
-    fHiGainFadcSamples->Set(nsamhi+nhi*npic);
-    fLoGainFadcSamples->Set(nsamlo+nlo*npic);
-
-    Byte_t *higainsam = fHiGainFadcSamples->GetArray()+nsamhi;
-    Byte_t *logainsam = fLoGainFadcSamples->GetArray()+nsamlo;
+    const UShort_t npos = npic*fPosInArray;
+
+    Byte_t *higainsam = fHiGainFadcSamples->GetArray()+nhi*npos;
+    Byte_t *logainsam = fLoGainFadcSamples->GetArray()+nlo*npos;
+
+    // UShort_t *hipixid = (UShort_t*)fHiGainPixId->GetArray()+npos;
+    // UShort_t *lopixid = (UShort_t*)fLoGainPixId->GetArray()+npos;
 
     for (int i=0; i<npic; i++)
@@ -409 +423 @@
         const UShort_t npix = fRunHeader->GetPixAssignment(i);
 
+        const UShort_t ipos = npos+i;
         //
         //  This is to fill the data of one pixel to the MRawEvtHeader Class.
@@ -414 +429 @@
         //  Add to lo gains if lflag = 1
         //
-        fHiGainPixId->AddAt(npix, npixhi+i);
+        fHiGainPixId->AddAt(npix, ipos);
         fin.read(higainsam, nhi);
         higainsam += nhi;
@@ -421 +436 @@
         //if (IsLoGainOn(i, j))
         //{
-        fLoGainPixId->AddAt(npix, npixlo+i);
+        fLoGainPixId->AddAt(npix, ipos);
         fin.read(logainsam, nlo);
         logainsam += nlo;