Changeset 2207 for trunk/MagicSoft/Mars/mraw

Timestamp:

06/23/03 11:19:04 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtData.cc (modified) (3 diffs)
• MRawEvtData.h (modified) (1 diff)
• MRawEvtPixelIter.cc (modified) (1 diff)
• MRawEvtPixelIter.h (modified) (1 diff)
• MRawFileRead.cc (modified) (3 diffs)
• MRawFileRead.h (modified) (1 diff)
• MRawFileWrite.cc (modified) (2 diffs)
• MRawFileWrite.h (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -64 +64 @@
 #include "MArrayS.h"
 #include "MArrayB.h"
+#include "MGeomCam.h"
 #include "MRawRunHeader.h"
 #include "MRawEvtPixelIter.h"
@@ -472 +473 @@
 }
 
-Bool_t MRawEvtData::GetPixelContent(Float_t &val, Int_t idx, Float_t ratio, Int_t type) const
+Bool_t MRawEvtData::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
 {
     MRawEvtPixelIter Next(const_cast<MRawEvtData*>(this));
@@ -478 +479 @@
         return kFALSE;
 
-    val = Next.GetSumHiGainSamples();
+    val = Next.GetSumHiGainSamples()-(float)GetNumHiGainSamples()*fHiGainFadcSamples->GetArray()[0];
+    val *= cam.GetPixRatio(idx);
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/mraw/MRawEvtData.h

@@ -64 +64 @@
     void ReadEvt(istream &fin);
 
-    Bool_t GetPixelContent(Float_t &val, Int_t idx, Float_t ratio=1, Int_t type=0) const;
+    Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
     void   DrawPixelContent(Int_t num) const
     {

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -203 +203 @@
 }
 
+Byte_t MRawEvtPixelIter::GetNumMaxHiGainSample() const
+{
+    Byte_t max  = 0;
+    Byte_t maxi = 0;
+
+    for (int i=0; i<fNumHiGainSamples; i++)
+        if (fHiGainPos[i]>max)
+        {
+            max = fHiGainPos[i];
+            maxi = i;
+        }
+
+    return maxi;
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -81 +81 @@
     Float_t GetVarHiGainSamples() const;
 
+    Byte_t GetNumMaxHiGainSample() const;
+
     Bool_t HasLoGain() const
     {

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -128 +128 @@
 // Now the EvtHeader and EvtData containers are initialized.
 //
-Bool_t MRawFileRead::PreProcess(MParList *pList)
+Int_t MRawFileRead::PreProcess(MParList *pList)
 {
     //
@@ -192 +192 @@
 //  - the raw data information of one event is read
 //
-Bool_t MRawFileRead::Process()
+Int_t MRawFileRead::Process()
 {
     //
@@ -236 +236 @@
 //  if it doesn't match.
 //
-Bool_t MRawFileRead::PostProcess()
+Int_t MRawFileRead::PostProcess()
 {
     //

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -29 +29 @@
     ifstream       *fIn;            //! buffered input stream (file to read from)
 
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
+    Int_t PostProcess();
+
+
 public:
     MRawFileRead(const char *filename, const char *name=NULL, const char *title=NULL);
     ~MRawFileRead();
-
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-    Bool_t PostProcess();
 
     ClassDef(MRawFileRead, 0)   // Task to read the raw data binary file

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -109 +109 @@
 // are created.
 //
-Bool_t MRawFileWrite::PreProcess (MParList *pList)
+Int_t MRawFileWrite::PreProcess (MParList *pList)
 {
     //
@@ -231 +231 @@
 // event should be filled in and fills  it into this tree.
 //
-Bool_t MRawFileWrite::Process()
+Int_t MRawFileWrite::Process()
 {
     //

trunk/MagicSoft/Mars/mraw/MRawFileWrite.h

@@ -41 +41 @@
     ~MRawFileWrite();
 
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
 
     ClassDef(MRawFileWrite, 0)  // Task to write the raw data containers to a root file

trunk/MagicSoft/Mars/mraw/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../MBase -I../mgui
+INCLUDES = -I. -I../mbase -I../mgui -I../mgeom -I../MBase
 
 #------------------------------------------------------------------------------