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

Timestamp:

03/01/01 15:56:58 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -216 +216 @@
 }
 
-void MRawEvtData::DeletePixels()
+void MRawEvtData::DeletePixels(Bool_t flag)
 {
     //
@@ -222 +222 @@
     //
     DeleteArrays();
-    InitArrays();
+    InitArrays(flag);
 }
 
@@ -233 +233 @@
 }
 
-void MRawEvtData::InitArrays()
-{
-    fHiGainPixId       = new MArrayS(0); //UShort_t[0];
-    fLoGainPixId       = new MArrayS(0); //new UShort_t[0];
-    fHiGainFadcSamples = new MArrayB(0); //new Byte_t[0];
-    fLoGainFadcSamples = new MArrayB(0); //new Byte_t[0];
+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());
 }
 
@@ -248 +250 @@
     //  Add to lo gains if lflag = 1
     //
-
     MArrayS *arrpix = lflag ? fLoGainPixId       : fHiGainPixId;
     MArrayB *arrsam = lflag ? fLoGainFadcSamples : fHiGainFadcSamples;
@@ -286 +287 @@
 }
 
-/*
-void MRawEvtData::AddPixelLo(UShort_t nOfPixel, TArrayC *data, int nr, int pos)
-{
-    //
-    // add the number of the new pixel to the array as last entry
-    //
-    fLoGainPixId->AddAt(nOfPixel, nr);
-
-    //
-    // add the new slices as last entries to array
-    //
-    fLoGainFadcSamples->AddAt((Byte_t*)data->GetArray(), pos,  data->GetSize());
-}
-
-void MRawEvtData::AddPixelHi(UShort_t nOfPixel, TArrayC *data, int nr, int pos)
-{
-    // check whether we got the right number of new samples
-    // if there are no samples already stored: this is the new number of samples
-    //
-    const Byte_t ns = data->GetSize();
-
-    //
-    // add the number of the new pixel to the array as last entry
-    //
-    fHiGainPixId->AddAt(nOfPixel, nr);
-
-    //
-    // add the new slices as last entries to array
-    //
-    fHiGainFadcSamples->AddAt((Byte_t*)data->GetArray(), arrsam->GetSize()-ns, ns);
-}
-*/
-void MRawEvtData::ReadEvt(ifstream &fin)
+void MRawEvtData::ReadEvt(istream &fin)
 {
     //
@@ -327 +296 @@
     const UShort_t nhi = fRunHeader->GetNumSamplesHiGain();
 
-    TArrayC lo(nlo);
-    TArrayC hi(nhi);
-
     const UShort_t npic = fRunHeader->GetNumPixInCrate();
+
+    //
+    // Enhance array by the size which we'll read now
+    //
+    Byte_t lo[nlo];
+    Byte_t hi[nhi];
+
+    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);
 
     for (int i=0; i<npic; i++)
@@ -339 +323 @@
         const UShort_t npix = fRunHeader->GetPixAssignment(i);
 
-        fin.read((Byte_t*)hi.GetArray(), nhi);
-        AddPixel(npix, &hi, kFALSE);
+        //
+        //  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
+        //
+        fin.read(hi, nhi);
+        fHiGainPixId->AddAt(npix, npixhi+i);
+        fHiGainFadcSamples->AddAt(hi, nsamhi+i*nhi, nhi);
 
         // FIXME: Not implemented in the raw files yet
         //if (IsLoGainOn(i, j))
         //{
-        fin.read((Byte_t*)lo.GetArray(), nlo);
-        AddPixel(npix, &lo, kTRUE);
+        fin.read(lo, nlo);
+        fLoGainPixId->AddAt(npix, npixlo+i);
+        fLoGainFadcSamples->AddAt(lo, nsamlo+i*nlo, nlo);
         //}
     }