Changeset 2200

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -40 +40 @@
      - default mode changed from UPDATE to RECREATE
      - default compression level changed from 9 to 1
+
+   * mraw/MRawEvtData.[h,cc]:
+     - fixed to skip non connected pixels
+     
+   * mraw/MRawRunHeader.[h,cc]:
+     - added GetNumConnectedPixels
+
 
 

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++;
     }
 

trunk/MagicSoft/Mars/mraw/MRawEvtData.h

@@ -30 +30 @@
     MArrayB *fLoGainFadcSamples;  // list of lo gain samples of all pixels (ordering: see fLoGainPixId)
 
-    Int_t fPosInArray;   //!
-    Int_t fArraySize;    //!
+    Int_t fPosInArray;        //!
+    Int_t fConnectedPixels;   //!
+    Int_t fArraySize;         //!
 
     void InitArrays(Bool_t flag=kFALSE);

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -173 +173 @@
 }
 
+UShort_t MRawRunHeader::GetNumConnectedPixels() const
+{
+    const Int_t num = fPixAssignment->GetSize();
+
+    UShort_t rc = 0;
+    for (int i=0; i<num; i++)
+        if (GetPixAssignment(i)>0)
+            rc++;
+    return rc;
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -95 +95 @@
     UInt_t   GetNumEvents() const         { return fNumEvents; }
     UShort_t GetPixAssignment(UShort_t i) const;
+    UShort_t GetNumConnectedPixels() const;
 
     UInt_t GetNumSamplesPerCrate() const