Changeset 11869 for trunk/Mars/mraw

Timestamp:

08/09/11 23:52:20 (13 years ago)

Author:

tbretz

Message:

Implemented the possibility to set the pixel map in the run-header when initializing for fact data.

Location:

trunk/Mars/mraw

Files:

• MRawRunHeader.cc (modified) (2 diffs)
• MRawRunHeader.h (modified) (2 diffs)

trunk/Mars/mraw/MRawRunHeader.cc

@@ -1283 +1283 @@
 }
 
-void MRawRunHeader::InitFact(UShort_t num, UShort_t pix, UShort_t samples)
+void MRawRunHeader::InitFact(UShort_t num, UShort_t pix, UShort_t samples, UShort_t *map)
 {
     fNumCrates     = num;
@@ -1292 +1292 @@
     fPixAssignment->Set(num*pix);
 
-    for (int i=0; i<num*pix; i++)
-        (*fPixAssignment)[i] = i+1;
+    if (map)
+        for (int i=0; i<num*pix; i++)
+            (*fPixAssignment)[i] = map[i]+1;
+    else
+    {
+        for (int i=0; i<num*pix; i++)
+            (*fPixAssignment)[i] = i+1;
+    }
 
     fNumSamplesHiGain  = samples;

trunk/Mars/mraw/MRawRunHeader.h

@@ -109 +109 @@
     void InitCamera(UShort_t type, UShort_t pix=0);
     void InitPixels(UShort_t pix) { InitCamera((UShort_t)-1, pix); }
-    void InitFact(UShort_t num, UShort_t pix, UShort_t samples);
+    void InitFact(UShort_t num, UShort_t pix, UShort_t samples, UShort_t *map=0);
     void SetRunType(UShort_t type) { fRunType=type; }
     void SetRunInfo(UShort_t tel, UInt_t run, UInt_t file=0);
@@ -164 +164 @@
     UInt_t   GetMax() const { switch (fNumBytesPerSample) { case 1: return 0xff; case 2: return 0xffff; case 4: return 0xffffffff; } return 0; }
 
+    const MArrayS &GetPixAssignment() const { return *fPixAssignment; }
+
     UInt_t GetNumSamplesPerCrate() const
     {