Changeset 11489

Timestamp:

07/20/11 18:01:11 (13 years ago)

Author:

tbretz

Message:

Added fStartCells and increased version number

Location:

trunk/Mars/mraw

Files:

• MRawEvtData.cc (modified) (4 diffs)
• MRawEvtData.h (modified) (4 diffs)

trunk/Mars/mraw/MRawEvtData.cc

@@ -47 +47 @@
 //
 //
+//   Version 8
+//   ------------------
+//    + MArrayS *fStartCell
+//
 //   Version 7
 //   ------------------
@@ -358 +362 @@
 
     fABFlags           = new MArrayB(maxid==0 ? 0 : maxid/8+1);
+    fStartCells        = new MArrayS(0);
 
     fConnectedPixels   = 0;
+}
+
+void MRawEvtData::InitStartCells()
+{
+    delete fStartCells;
+    fStartCells = new MArrayS(fHiGainPixId->GetSize());
 }
 
@@ -373 +384 @@
     delete fLoGainFadcSamples;
     delete fABFlags;
+    delete fStartCells;
 }
 
@@ -510 +522 @@
         (*fHiGainPixId)[i] = i;
 }
+
+Byte_t   *MRawEvtData::GetSamples() const    { return fHiGainFadcSamples->GetArray(); }
+UShort_t *MRawEvtData::GetStartCells() const { return fStartCells->GetArray(); }
+UShort_t *MRawEvtData::GetPixelIds() const   { return fHiGainPixId->GetArray(); }
+Bool_t    MRawEvtData::HasStartCells() const { return fStartCells->GetSize()==fHiGainPixId->GetSize(); }
 
 /*

trunk/Mars/mraw/MRawEvtData.h

@@ -36 +36 @@
 
     MArrayB *fABFlags;            //-> A information about the exact trigger position
+    MArrayS *fStartCells;         //
 
     UShort_t fNumBytesPerSample;
@@ -77 +78 @@
     void ResetPixels();
     void ResetPixels(UShort_t npix, UShort_t maxid);
+    void InitStartCells();
     void AddPixel(UShort_t nOfPixel, const TArrayC &data);
     void Set(const MArrayI &data);
@@ -90 +92 @@
     UInt_t   GetScale() const { return 1<<((fNumBytesPerSample-1)*8); }
     UInt_t   GetMax() const   { return (UInt_t)(~1)>>((4-fNumBytesPerSample)*8); }
+
+    Byte_t   *GetSamples() const;
+    UShort_t *GetStartCells() const;
+    UShort_t *GetPixelIds() const;
+
+    Bool_t HasStartCells() const;
 
     void ReadPixel(istream &fin, Int_t npix);
@@ -109 +117 @@
         ;
 
-    ClassDef(MRawEvtData, 7) //Container to store the raw Event Data
+    ClassDef(MRawEvtData, 8) //Container to store the raw Event Data
 };