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

Timestamp:

06/18/03 18:04:46 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -170 +170 @@
     {
         *fLog << endl;
-        *fLog << " " << setfill(' ') << setw(3) << dec << i << ": ";
+        *fLog << " " << setfill(' ') << setw(3) << dec << i << " -";
+        *fLog << " " << setfill(' ') << setw(3) << dec << (*fHiGainPixId)[i] << ": ";
         *fLog << (manip?dec:hex) << flush;
 
@@ -313 +314 @@
     if (fRunHeader && flag)
     {
-        const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
+        //const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
+        const int npix = fRunHeader->GetNumConnectedPixels();
 
         if (fArraySize == npix)
         {
             fPosInArray = 0;
+            fConnectedPixels = 0;
             return;
         }
@@ -347 +350 @@
     if (flag && fRunHeader)
     {
-        const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
+        //const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
+        const int npix = fRunHeader->GetNumConnectedPixels();
 
         fHiGainPixId       = new MArrayS(npix);
@@ -367 +371 @@
 
     fPosInArray = 0;
+    fConnectedPixels = 0;
 }
 
@@ -428 +433 @@
     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;
+    Byte_t *higainsam = fHiGainFadcSamples->GetArray()+nhi*fConnectedPixels;
+    Byte_t *logainsam = fLoGainFadcSamples->GetArray()+nlo*fConnectedPixels;
 
     for (int i=0; i<npic; i++)
     {
-        //
-        // get the spiral pixel number from the run header
-        //
+        fin.read((char*)higainsam, nhi);
+        fin.read((char*)logainsam, nlo);
+
+        // calc the spiral hardware pixel number
         const UShort_t ipos = npos+i;
 
-        const UShort_t npix = fRunHeader->GetPixAssignment(ipos);
+        // -1 converts the hardware pixel Id into the software pixel index
+        const Int_t npix = fRunHeader->GetPixAssignment(ipos);
+
+        // Check whether the pixel is connected or not
+        if (npix==0)
+            continue;
 
         //
@@ -448 +456 @@
         //  Add to lo gains if lflag = 1
         //
-        fHiGainPixId->AddAt(npix, ipos);
-        fin.read((char*)higainsam, nhi);
+        fHiGainPixId->AddAt(npix, fConnectedPixels);
         higainsam += nhi;
 
@@ -455 +462 @@
         //if (IsLoGainOn(i, j))
         //{
-        fLoGainPixId->AddAt(npix, ipos);
-        fin.read((char*)logainsam, nlo);
+        fLoGainPixId->AddAt(npix, fConnectedPixels);
         logainsam += nlo;
         //}
+
+        fConnectedPixels++;
     }