Changeset 2207

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mmain/MStatusDisplay.cc (modified) (23 diffs)
• mmain/MStatusDisplay.h (modified) (1 diff)
• mmontecarlo/MMcCollectionAreaCalc.cc (modified) (3 diffs)
• mmontecarlo/MMcCollectionAreaCalc.h (modified) (1 diff)
• mmontecarlo/MMcThresholdCalc.cc (modified) (3 diffs)
• mmontecarlo/MMcThresholdCalc.h (modified) (2 diffs)
• mmontecarlo/MMcTimeGenerate.cc (modified) (3 diffs)
• mmontecarlo/MMcTimeGenerate.h (modified) (2 diffs)
• mmontecarlo/MMcTriggerRateCalc.cc (modified) (6 diffs)
• mmontecarlo/MMcTriggerRateCalc.h (modified) (5 diffs)
• mranforest/MRanForestCalc.cc (modified) (2 diffs)
• mranforest/MRanForestCalc.h (modified) (2 diffs)
• mranforest/MRanForestFill.cc (modified) (3 diffs)
• mranforest/MRanForestFill.h (modified) (2 diffs)
• mranforest/MRanForestGrow.cc (modified) (3 diffs)
• mranforest/MRanForestGrow.h (modified) (2 diffs)
• mraw/MRawEvtData.cc (modified) (3 diffs)
• mraw/MRawEvtData.h (modified) (1 diff)
• mraw/MRawEvtPixelIter.cc (modified) (1 diff)
• mraw/MRawEvtPixelIter.h (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (3 diffs)
• mraw/MRawFileRead.h (modified) (1 diff)
• mraw/MRawFileWrite.cc (modified) (2 diffs)
• mraw/MRawFileWrite.h (modified) (1 diff)
• mraw/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -340 +340 @@
 void MStatusDisplay::SetLogStream(MLog *log, Bool_t enable)
 {
+    if (gROOT->IsBatch())
+        return;
+
     if (log && fLogBox==NULL)
     {
@@ -455 +458 @@
 void MStatusDisplay::SetStatusLine1(const char *txt)
 {
+    if (gROOT->IsBatch())
+        return;
     fStatusBar->SetText(txt, 0);
     gClient->ProcessEventsFor(fStatusBar);
@@ -465 +470 @@
 void MStatusDisplay::SetStatusLine2(const char *txt)
 {
+    if (gROOT->IsBatch())
+        return;
     fStatusBar->SetText(txt, 1);
     gClient->ProcessEventsFor(fStatusBar);
@@ -491 +498 @@
 //
 MStatusDisplay::MStatusDisplay(Long_t t)
-: TGMainFrame(gClient->GetRoot(), 1, 1), fTimer(this, t, kTRUE), fStatus(kLoopNone), fLog(&gLog), fLogIdx(-1), fLogTimer(this, 250, kTRUE), fLogBox(NULL), fIsLocked(0)
+: TGMainFrame(gClient ? gClient->GetRoot() : NULL, 1, 1), fTimer(this, t, kTRUE), fStatus(kLoopNone), fLog(&gLog), fLogIdx(-1), fLogTimer(this, 250, kTRUE), fLogBox(NULL), fIsLocked(0)
 {
     gROOT->GetListOfSpecials()->Add(this);
-    gROOT->GetListOfCleanups()->Add(this);
 
     fFont = gVirtualX->LoadQueryFont("7x13bold");
+
+    fBatch.SetOwner();
 
     //
@@ -521 +529 @@
     // Add Widgets (from top to bottom)
     //
-    AddMenuBar();
-    AddTabs();
-    AddProgressBar();
-    AddStatusBar();
+    if (gClient) // BATCH MODE
+    {
+        AddMenuBar();
+        AddTabs();
+        AddProgressBar();
+        AddStatusBar();
+    }
 
     //
@@ -547 +558 @@
 MStatusDisplay::~MStatusDisplay()
 {
+    gROOT->GetListOfSpecials()->Remove(this);
+
     SetLogStream(NULL);
 
@@ -553 +566 @@
     if (fFont)
         gVirtualX->DeleteFont(fFont);
-
-    gROOT->GetListOfSpecials()->Remove(this);
-    gROOT->GetListOfCleanups()->Remove(this);
-} 
+}
 
 // --------------------------------------------------------------------------
@@ -594 +604 @@
 TCanvas *MStatusDisplay::GetCanvas(int i) const
 {
+    if (gROOT->IsBatch())
+        return (TCanvas*)fBatch.At(i-1);
+
     if (i<0 || i>=fTab->GetNumberOfTabs())
     {
@@ -656 +669 @@
 TCanvas &MStatusDisplay::AddTab(const char *name)
 {
+    if (gROOT->IsBatch())
+    {
+        TCanvas *c = new TCanvas(name, name);
+        fBatch.Add(c);
+        return *c;
+    }
+
     // Add new tab
     TGCompositeFrame *f = fTab->AddTab(name);
 
-    // create root embedded canvas and add it to the tab
+    // create root emb 0edded canvas and add it to the tab
     TRootEmbeddedCanvas *ec = new TRootEmbeddedCanvas(name, f, f->GetWidth(), f->GetHeight(), 0);
     f->AddFrame(ec, fLayCanvas);
@@ -676 +696 @@
     // layout and map new tab
 //#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,00)
+//    MapSubwindows();
+//    Layout();
+//#else
+    Layout();
     MapSubwindows();
     Layout();
-//#else
-//    Layout();
-//    MapSubwindows();
 //#endif
 
@@ -707 +728 @@
         return;
 
-    c->Modified();
-    c->Update();
-    c->Paint();
+    // Code taken from TCanvas::Update() and TCanvas::Paint
+    c->FeedbackMode(kFALSE);  // Goto double buffer mode
+    c->Paint();               // Repaint all pad's
+    c->Flush();               // Copy all pad pixmaps to the screen
+    //c->SetCursor(kCross);
+
+    // Old version
+    //c->Modified();
+    //c->Update();
+    //c->Paint();
 }
 
@@ -803 +831 @@
 Bool_t MStatusDisplay::HasCanvas(const TCanvas *c) const
 {
+    if (gROOT->IsBatch())
+        return fBatch.FindObject(c);
+
     for (int i=1; i<fTab->GetNumberOfTabs(); i++)
         if (c==GetCanvas(i))
@@ -829 +860 @@
     case kLoopStop:
     case kFileExit:
-        if (id==kFileExit && !fIsLocked)
+        if (id==kFileExit)
             delete this;
         fStatus = (Status_t)id;
@@ -1154 +1185 @@
 void MStatusDisplay::SetNoContextMenu(Bool_t flag)
 {
-    if (fIsLocked>1)
+    if (fIsLocked>1 || gROOT->IsBatch())
         return;
 
@@ -1173 +1204 @@
 Bool_t MStatusDisplay::HandleTimer(TTimer *timer)
 {
+    if (gROOT->IsBatch())
+        return kTRUE;
+
     const Int_t c = fTab->GetCurrent();
 
@@ -1302 +1336 @@
     }
 
-    if (num>=fTab->GetNumberOfTabs())
+    if (!gROOT->IsBatch() && num>=fTab->GetNumberOfTabs())
     {
         *fLog << warn << "MStatusDisplay::Write: Tab doesn't exist... skipped." << endl;
         return 0;
     }
+    if (gROOT->IsBatch() && num>fBatch.GetSize())
+    {
+        *fLog << warn << "MStatusDisplay::Write: Tab doesn't exist... skipped." << endl;
+        return 0;
+    }
 
     TObjArray list;
 
-    const Int_t from = num<0 ? 1 : num;
-    const Int_t to   = num<0 ? fTab->GetNumberOfTabs() : num+1;
+    const Int_t max  = gROOT->IsBatch() ? fBatch.GetSize()+1 : fTab->GetNumberOfTabs();
+    const Int_t from = num<0 ?   1 : num;
+    const Int_t to   = num<0 ? max : num+1;
 
     TCanvas *c;
@@ -1406 +1446 @@
 Bool_t MStatusDisplay::CheckTabForCanvas(int num) const
 {
+    if (gROOT->IsBatch())
+        return num>0 && num<=fBatch.GetSize() || num<0;
+
     if (num>=fTab->GetNumberOfTabs())
     {
@@ -1530 +1573 @@
     // Maintain tab numbers
     //
-    const Int_t from = num<0 ? 1 : num;
-    const Int_t to   = num<0 ? fTab->GetNumberOfTabs() : num+1;
+    const Int_t max  = gROOT->IsBatch() ? fBatch.GetSize()+1 : fTab->GetNumberOfTabs();
+    const Int_t from = num<0 ?   1 : num;
+    const Int_t to   = num<0 ? max : num+1;
 
     for (int i=from; i<to; i++)
@@ -1572 +1616 @@
         CanvasSetFillColor(*n, kWhite);
         l.Add(n);
-
         //
         // Paint canvas into root file
@@ -1578 +1621 @@
         if (num<0)
             *fLog << inf << " - ";
-        *fLog << inf << "Writing Tab #" << i << ": " << c->GetName() << " (" << n << ") ";
+        *fLog << inf << "Writing Tab #" << i << ": " << c->GetName() << " (" << c << ") ";
         if (num>0)
             *fLog << "to " << name;
@@ -1614 +1657 @@
 
     gPad = NULL; // Important!
-
     l.Delete();
 
@@ -1621 +1663 @@
 
     gVirtualPS = psave;
-    padsav->cd();
+    if (padsav)
+        padsav->cd();
 
     *fLog << inf << "done." << endl;
@@ -1632 +1675 @@
 Bool_t MStatusDisplay::SaveAsGIF(Int_t num, TString name)
 {
+    if (gROOT->IsBatch())
+    {
+        *fLog << warn << "Sorry, writing gif-files is not available in batch mode." << endl;
+        return 0;
+    }
     SetStatusLine1("Writing GIF file...");
     SetStatusLine2("");

trunk/MagicSoft/Mars/mmain/MStatusDisplay.h

@@ -74 +74 @@
 
     UInt_t fIsLocked;
+
+    TList fBatch;
 
     void AddMenuBar();

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -65 +65 @@
 } 
 
-Bool_t MMcCollectionAreaCalc::PreProcess (MParList *pList)
+Int_t MMcCollectionAreaCalc::PreProcess (MParList *pList)
 {
     // connect the raw data with this task
@@ -151 +151 @@
 }
 
-Bool_t MMcCollectionAreaCalc::Process()
+Int_t MMcCollectionAreaCalc::Process()
 {
     const Double_t energy = fMcEvt->GetEnergy();
@@ -178 +178 @@
 }
 
-Bool_t MMcCollectionAreaCalc::PostProcess()
+Int_t MMcCollectionAreaCalc::PostProcess()
 { 
     //

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h

@@ -30 +30 @@
     Bool_t fAllEvtsTriggered;
 
+    Bool_t ReInit(MParList *plist);
+
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
+    Int_t PostProcess();
+
 public:
     MMcCollectionAreaCalc(const char *input=NULL,
                           const char *name=NULL, const char *title=NULL);
-
-    Bool_t ReInit(MParList *plist);
-
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-    Bool_t PostProcess();
 
     ClassDef(MMcCollectionAreaCalc, 0) // Task to calculate the collection area histogram

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc

@@ -100 +100 @@
 // connect Monte Carlo data with this task
 //
-Bool_t MMcThresholdCalc::PreProcess(MParList* pList)
+Int_t MMcThresholdCalc::PreProcess(MParList* pList)
 {
     //
@@ -142 +142 @@
 // distribution to get the energy threshold.
 //
-Bool_t MMcThresholdCalc::Process()
+Int_t MMcThresholdCalc::Process()
 {
     const Float_t energy   = fMcEvt->GetEnergy();
@@ -160 +160 @@
 // Some iterations are done to be sure the fit parameters converge.
 //
-Bool_t MMcThresholdCalc::PostProcess()
+Int_t MMcThresholdCalc::PostProcess()
 {
     for (UInt_t i=0; i<fNum; i++)

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.h

@@ -14 +14 @@
 #endif
 #ifndef ROOT_TObjArray
-#include "TObjArray.h"
+#include <TObjArray.h>
 #endif
 
@@ -39 +39 @@
     MHMcEnergy *GetHEnergy(UInt_t i) { return (MHMcEnergy*)(*fEnergy)[i]; }
 
+    Int_t PreProcess(MParList* pList);
+    Int_t Process();
+    Int_t PostProcess();
+
 public:
-
     MMcThresholdCalc(const Int_t dim = 0,
                      const char* name = NULL, const char* title = NULL);
     ~MMcThresholdCalc();
-
-    Bool_t PreProcess(MParList* pList);
-    Bool_t Process();
-    Bool_t PostProcess();
 
     ClassDef(MMcThresholdCalc, 0) // Task to compute the energy threshold

trunk/MagicSoft/Mars/mmontecarlo/MMcTimeGenerate.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !   Author(s): Harald Kornmayer 1/2001
 !
@@ -63 +63 @@
 //  options, either Montecarlo files with a single trigger option.
 //
-Bool_t MMcTimeGenerate::PreProcess (MParList *pList)
+Int_t MMcTimeGenerate::PreProcess (MParList *pList)
 {
     // connect the raw data with this task
@@ -77 +77 @@
 //
 //
-Bool_t MMcTimeGenerate::Process()
+Int_t MMcTimeGenerate::Process()
 {
     Double_t dt;

trunk/MagicSoft/Mars/mmontecarlo/MMcTimeGenerate.h

@@ -20 +20 @@
     Double_t fDeadTime;
 
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
+
 public:
     MMcTimeGenerate(const char *name=NULL, const char *title=NULL);
@@ -25 +28 @@
     ~MMcTimeGenerate();
 
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-
     ClassDef(MMcTimeGenerate, 0) // To generate a random time
 };

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !   Author(s): Harald Kornmayer 1/2001
 !
 !   Copyright: MAGIC Software Development, 2000-2003
 !
-!   Modified 4/7/2002 Abelardo Moralejo: now the dimension of fTrigger is
-!    set dinamically, to allow an arbitrary large number of trigger 
-!    conditions to be processed.
-!
 !
 \* ======================================================================== */
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Modified 4/7/2002 Abelardo Moralejo: now the dimension of fTrigger is
+//  set dinamically, to allow an arbitrary large number of trigger
+//  conditions to be processed.
+//
+/////////////////////////////////////////////////////////////////////////////
 #include "MMcTriggerRateCalc.h"
 
@@ -32 +36 @@
 
 #include <TCanvas.h>
+#include <TGraphErrors.h>
 
 #include "MLog.h"
@@ -215 +220 @@
 //  options, either Montecarlo files with a single trigger option.
 //
-Bool_t MMcTriggerRateCalc::PreProcess (MParList *pList)
+Int_t MMcTriggerRateCalc::PreProcess (MParList *pList)
 {
     // connect the raw data with this task
@@ -266 +271 @@
 //  MHMcRate container.
 //
-Bool_t MMcTriggerRateCalc::Process()
+Int_t MMcTriggerRateCalc::Process()
 {
     //
@@ -318 +323 @@
 //  The PostProcess-function calculates and shows the trigger rate
 //
-Bool_t MMcTriggerRateCalc::PostProcess()
+Int_t MMcTriggerRateCalc::PostProcess()
 {
     for (UInt_t i=0; i<fNum; i++)
@@ -374 +379 @@
      sure, that the histograms are not overwritten.
      Also the comment for the function doesn't match the rules.
-
+     BTW: please replace all arrays by Root lists (TArray*, TList, etc)
   TCanvas *c = MH::MakeDefCanvas("Rate");
 

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.h

@@ -9 +9 @@
 #endif
 
-#include <TGraphErrors.h>
-
 class MParList;
 class MMcEvt;
@@ -17 +15 @@
 class MMcTrig;
 class MHMcRate;
+class TH1F;
 
 class MMcTriggerRateCalc : public MTask
 {
 private:
-    MMcEvt    *fMcEvt;        //!
+    MMcEvt    *fMcEvt;     //!
 
     TObjArray *fMcRate;
@@ -29 +28 @@
     MMcCorsikaRunHeader *fMcCorRunHeader; 
 
-    UInt_t     fNum;           // decoded dimension
+    UInt_t     fNum;       // decoded dimension
     UInt_t     fFirst;
     UInt_t     fLast;
 
-    Float_t*   fTrigNSB;   // Number of triggers due to NSB alone
+    Float_t   *fTrigNSB;   // Number of triggers due to NSB alone
     Float_t    fSimNSB;    // Number of simulated NSB-only events
 
-    Float_t*   fTrigger;       // Number of triggered showers
-    Float_t    fShowers;       // Number of simulated showers
-    Float_t    fAnalShow;      // Number of analysed showers
+    Float_t   *fTrigger;   // Number of triggered showers
+    Float_t    fShowers;   // Number of simulated showers
+    Float_t    fAnalShow;  // Number of analysed showers
 
-    Int_t      fPartId;        // Incident particle that generates showers
+    Int_t      fPartId;    // Incident particle that generates showers
+
+    TH1F      *fHist[5];
 
     void Init(int dim, float *trigbg,
@@ -48 +49 @@
     MMcTrig  *GetTrig(UInt_t i) const { return (MMcTrig*)((*fMcTrig)[i]); }
 
-    TH1F*     fHist[5];
+    Bool_t ReInit(MParList *plist);
+
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
+    Int_t PostProcess();
 
 public:
@@ -59 +64 @@
     ~MMcTriggerRateCalc();
 
-    Bool_t ReInit(MParList *plist);
-
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-    Bool_t PostProcess();
-
     TH1F* GetHist(Int_t i) {return fHist[i];}
 

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -91 +91 @@
 // number of columns (with the same meaning).
 //
-Bool_t MRanForestCalc::PreProcess(MParList *plist)
+Int_t MRanForestCalc::PreProcess(MParList *plist)
 {
     fRanForest = (MRanForest*)plist->FindObject("MRanForest");
@@ -137 +137 @@
 //
 //
-Bool_t MRanForestCalc::Process()
+Int_t MRanForestCalc::Process()
 {
     // first copy the data from the data array to a vector event

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.h

@@ -24 +24 @@
     MRanTree    *fRanTree;
 
+    Int_t PreProcess(MParList *plist);
+    Int_t Process();
+
 public:
     MRanForestCalc(const char *name=NULL, const char *title=NULL);
@@ -33 +36 @@
     void SetUseNumTrees(UShort_t n=100) { fNum = n; }
 
-    Bool_t PreProcess(MParList *plist);
-    Bool_t Process();
-
     ClassDef(MRanForestCalc, 0) // Task
 };

trunk/MagicSoft/Mars/mranforest/MRanForestFill.cc

@@ -72 +72 @@
 
 // --------------------------------------------------------------------------
-Bool_t MRanForestFill::PreProcess(MParList *plist)
+Int_t MRanForestFill::PreProcess(MParList *plist)
 {
     fRanTree = (MRanTree*)plist->FindObject("MRanTree");
@@ -96 +96 @@
 //
 //
-Bool_t MRanForestFill::Process()
+Int_t MRanForestFill::Process()
 {
     fNum++;
@@ -105 +105 @@
 }
 
-Bool_t MRanForestFill::PostProcess()
+Int_t MRanForestFill::PostProcess()
 {
     fRanForest->SetNumTrees(fNum);

trunk/MagicSoft/Mars/mranforest/MRanForestFill.h

@@ -20 +20 @@
     Int_t fNum;
 
+    Int_t PreProcess(MParList *plist);
+    Int_t Process();
+    Int_t PostProcess();
+
 public:
     MRanForestFill(const char *name=NULL, const char *title=NULL);
@@ -26 +30 @@
     void SetNumTrees(UShort_t n=100) { fNumTrees = n; }
 
-    Bool_t PreProcess(MParList *plist);
-    Bool_t Process();
-    Bool_t PostProcess();
-
     ClassDef(MRanForestFill, 0) // Task
 };

trunk/MagicSoft/Mars/mranforest/MRanForestGrow.cc

@@ -75 +75 @@
 // number of columns (with the same meaning).
 //
-Bool_t MRanForestGrow::PreProcess(MParList *plist)
+Int_t MRanForestGrow::PreProcess(MParList *plist)
 {
     fMGammas = (MHMatrix*)plist->FindObject("MatrixGammas", "MHMatrix");
@@ -122 +122 @@
 //
 //
-Bool_t MRanForestGrow::Process()
+Int_t MRanForestGrow::Process()
 {
     Bool_t not_last=fRanForest->GrowForest();
@@ -130 +130 @@
 }
 
-Bool_t MRanForestGrow::PostProcess()
+Int_t MRanForestGrow::PostProcess()
 {
     fRanTree->SetReadyToSave();

trunk/MagicSoft/Mars/mranforest/MRanForestGrow.h

@@ -31 +31 @@
     Int_t fNdSize;
 
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
+    Int_t PostProcess();
+
 public:
     MRanForestGrow(const char *name=NULL, const char *title=NULL);
@@ -38 +42 @@
     void SetNdSize(Int_t n)  {    fNdSize=n;  }
 
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-    Bool_t PostProcess();
-
     ClassDef(MRanForestGrow, 0) // Task to grow a random forest
 };

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
 
 #------------------------------------------------------------------------------