Changeset 657 for trunk/MagicSoft/Mars/mraw

Timestamp:

03/01/01 17:16:14 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -301 +301 @@
     // Enhance array by the size which we'll read now
     //
-    Byte_t *lo = new Byte_t[nlo];
-    Byte_t *hi = new Byte_t[nhi];
+//    Byte_t *lo = new Byte_t[nlo];
+//    Byte_t *hi = new Byte_t[nhi];
 
     const int npixhi = fHiGainPixId->GetSize();
@@ -315 +315 @@
     fHiGainFadcSamples->Set(nsamhi+nhi*npic);
     fLoGainFadcSamples->Set(nsamlo+nlo*npic);
+
+    Byte_t *higainsam = fHiGainFadcSamples->GetArray()+nsamhi;
+    Byte_t *logainsam = fLoGainFadcSamples->GetArray()+nsamlo;
 
     for (int i=0; i<npic; i++)
@@ -328 +331 @@
         //  Add to lo gains if lflag = 1
         //
-        fin.read(hi, nhi);
         fHiGainPixId->AddAt(npix, npixhi+i);
-        fHiGainFadcSamples->AddAt(hi, nsamhi+i*nhi, nhi);
+        fin.read(higainsam, nhi);
+        higainsam += nhi;
+        //+++fin.read(hi, nhi);
+        //+++fHiGainFadcSamples->AddAt(hi, nsamhi+i*nhi, nhi);
 
         // FIXME: Not implemented in the raw files yet
         //if (IsLoGainOn(i, j))
         //{
-        fin.read(lo, nlo);
         fLoGainPixId->AddAt(npix, npixlo+i);
-        fLoGainFadcSamples->AddAt(lo, nsamlo+i*nlo, nlo);
+        fin.read(logainsam, nlo);
+        logainsam += nlo;
+        //+++fin.read(lo, nlo);
+        //+++fLoGainFadcSamples->AddAt(lo, nsamlo+i*nlo, nlo);
         //}
     }
-    delete lo;
-    delete hi;
-}
-
+//    delete lo;
+//    delete hi;
+}
+