Changeset 4648 for trunk/MagicSoft/Mars/mraw

Timestamp:

08/17/04 13:31:40 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtData.cc (modified) (5 diffs)
• MRawEvtData.h (modified) (2 diffs)
• MRawEvtHeader.cc (modified) (2 diffs)
• MRawEvtHeader.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -47 +47 @@
 //
 //
-//   Version 3:
-//   ----------
+//   Version 5 (0.8.5):
+//   ------------------
+//    - Changed type of ABFlags from TArrayC to MArrayB
+//
+//   Version 4 (0.8.4):
+//   ------------------
+//    - Changed derivement from MCamEvent to MParContainer and MCamEvent
+//
+//   Version 3 (0.8.4):
+//   ------------------
 //    - Added fABFlags
 //
@@ -397 +405 @@
     if (flag && fRunHeader)
     {
-        //const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
         const int npix = fRunHeader->GetNumConnectedPixels();
 
@@ -404 +411 @@
         fHiGainFadcSamples = new MArrayB(npix*fRunHeader->GetNumSamplesHiGain());
         fLoGainFadcSamples = new MArrayB(npix*fRunHeader->GetNumSamplesLoGain());
-        fABFlags           = new TArrayC(fRunHeader->GetMaxPixId());
+        fABFlags           = new MArrayB(fRunHeader->GetMaxPixId()/8+1);
 
         fArraySize  = npix;
@@ -414 +421 @@
         fHiGainFadcSamples = new MArrayB(0);
         fLoGainFadcSamples = new MArrayB(0);
-        fABFlags           = new TArrayC(0);
+        fABFlags           = new MArrayB(0);
 
         fArraySize = 0;
@@ -495 +502 @@
         const UShort_t ipos = npos+i;
 
+        // Get Hardware Id
+        const Short_t hwid = fRunHeader->GetPixAssignment(ipos);
+
+        // Check whether the pixel is connected or not
+        if (hwid<=0)
+            continue;
+
         // -1 converts the hardware pixel Id into the software pixel index
-        const Int_t npix = (Int_t)fRunHeader->GetPixAssignment(ipos)-1;
-
-        // Check whether the pixel is connected or not
-        if (npix<0)
-            continue;
+        const Int_t npix = /*hwid>0 ?*/ (Int_t)hwid-1 /*: hwid*/;
 
         //

trunk/MagicSoft/Mars/mraw/MRawEvtData.h

@@ -35 +35 @@
     MArrayB *fLoGainFadcSamples;  //-> list of lo gain samples of all pixels (ordering: see fLoGainPixId)
 
-    TArrayC *fABFlags;            //-> A information about the exact trigger position
+    MArrayB *fABFlags;            //-> A information about the exact trigger position
 
     Int_t fPosInArray;        //!
@@ -89 +89 @@
         ;
 
-    ClassDef(MRawEvtData, 4) //Container to store the raw Event Data
+    ClassDef(MRawEvtData, 5) //Container to store the raw Event Data
 };
 

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -399 +399 @@
 }
 
+UInt_t MRawEvtHeader::GetCalibrationPattern() const
+{
+    return fTrigPattern[1];
+}
+/*
 // --------------------------------------------------------------------------
 //
@@ -425 +430 @@
     return (CalibCol_t)((fTrigPattern[1]<<24)&0xf);
 }
+*/

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -25 +25 @@
         kTTCalibration = 2
     };
-
+/*
     enum CalibCol_t {
         kColRed   = BIT(0),
@@ -33 +33 @@
         kColUV    = BIT(4)
     };
-
+ */
 private:
     MTime   *fTime;            //! object to store the time in (ReadEvt)
@@ -74 +74 @@
     
     UInt_t     GetTriggerID() const;
-
+    UInt_t     GetCalibrationPattern() const;
+/*
     UShort_t   GetPulserSlotPattern() const;
     Byte_t     GetPowerOfContLight() const;
     CalibCol_t GetContLedColor() const;
-
+ */
     Int_t ReadEvt(istream& fin, UShort_t ver);
     void  SkipEvt(istream& fin, UShort_t ver);