Changeset 993 for trunk/MagicSoft/Mars

Timestamp:

10/26/01 11:44:11 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MMcPedestalCopy.cc (modified) (1 diff)
• mmain/MMars.cc (modified) (1 diff)
• mmain/MMonteCarlo.cc (modified) (7 diffs)
• mmontecarlo/MMcCollectionAreaCalc.cc (modified) (1 diff)
• mmontecarlo/MMcTriggerRateCalc.cc (modified) (1 diff)
• readraw.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -53 +53 @@
 }
 
-Bool_t MMcPedestalCopy::PreProcess( MParList *pList )
+Bool_t MMcPedestalCopy::PreProcess(MParList *pList)
 {
     fMcPedestals = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");

trunk/MagicSoft/Mars/mmain/MMars.cc

@@ -212 +212 @@
     //   Map the window, set up the layout, etc.
     //
-    SetWMSizeHints(400, 410, 400, 410, 10, 10);  // set the smallest and biggest size of the Main frame
+    SetWMSizeHints(330, 410, 330, 410, 10, 10);  // set the smallest and biggest size of the Main frame
 
     MapSubwindows();

trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

@@ -85 +85 @@
     fRadioButton3 = new TGRadioButton(group, "Use a number of trigger conditions (1..n).");
 
+    fRadioButton1->SetState(kButtonDown);
+
     /*
      FIXME: ~TGRadioButton fails with segfault in GetMainFrame
@@ -188 +190 @@
 #include "MMcCollectionAreaCalc.h"
 
+#include "../mmc/MMcTrig.hxx" // FIXME: see FIXME below
+
 Int_t MMonteCarlo::GetDim() const
 {
+    return 0;
     Int_t dim = atoi(fNumEntry->GetText());
 
@@ -216 +221 @@
     MTaskList tlist;
     plist.AddToList(&tlist);
+
+    //
+    // FIXME: This line is needed that root finds the MMc-classes in the
+    // dictionary when calling the constructor of MReadTree
+    // I don't have any idea why...
+    // Rem: This happens only in this GUI!
+    //
+    MMcTrig trig;
 
     //
@@ -309 +322 @@
 
     //
+    // FIXME: This line is needed that root finds the MMc-classes in the
+    // dictionary when calling the constructor of MReadTree
+    // I don't have any idea why...
+    // Rem: This happens only in this GUI!
+    //
+    MMcTrig trig;
+
+    //
     // Setup out tasks:
     //  - First we have to read the events
@@ -390 +411 @@
 
     //
+    // FIXME: This line is needed that root finds the MMc-classes in the
+    // dictionary when calling the constructor of MReadTree
+    // I don't have any idea why...
+    // Rem: This happens only in this GUI!
+    //
+    MMcTrig trig;
+
+    //
     // Setup the task list
     // - You need the read and the MMcThresholdCalc tasks
@@ -410 +439 @@
 
     //
-    // Begin the loop (if the loop wasn't succesfull
+    // Begin the loop (if the loop wasn't successfull
     // don't try to draw the results
     //
@@ -422 +451 @@
     TObject *obj;
     while ((obj=Next()))
-        obj->DrawClone();
+    obj->DrawClone();
 }
 

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -32 +32 @@
 
 #include "MMcEvt.hxx"
-#include "MMcTrig.hxx" 
+#include "MMcTrig.hxx"
 
 #include "MHMcCollectionArea.h"

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc

@@ -28 +28 @@
 #include "MLog.h"
 #include "MLogManip.h"
+
 #include "MParList.h"
-
 #include "MHMcRate.h"
+
 #include "MMcEvt.hxx"
-#include "MMcTrig.hxx" 
+#include "MMcTrig.hxx"
 
 ClassImp(MMcTriggerRateCalc);

trunk/MagicSoft/Mars/readraw.cc

@@ -17 +17 @@
 #include "MInputStreamID.h"
 
-#include "MMcEvt.hxx" 
-#include "MMcTrig.hxx" 
+#include "MMcEvt.hxx"
+#include "MMcTrig.hxx"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -28 +28 @@
 int main(const int argc, const char **argv)
 {
-    gLog << "==================================================" << endl ;
-    gLog << "                   ReadRaw v0.1" << endl;
-    gLog << "      MARS Merging and Preprocessing Program" << endl ;
-    gLog << "            Compiled on <" << __DATE__ << ">" << endl ;
-    gLog << "==================================================" << endl ;
+    gLog << "==================================================" << endl;
+    gLog << "                   ReadRaw v0.1                   " << endl;
+    gLog << "       MARS - Read and print raw data file        " << endl;
+    gLog << "            Compiled on <" << __DATE__ << ">" << endl;
+    gLog << "==================================================" << endl;
     gLog << endl;