Changeset 1325 for trunk/MagicSoft/Mars

Timestamp:

04/30/02 12:00:44 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• macros/readCT1.C (modified) (4 diffs)
• macros/readMagic.C (modified) (4 diffs)
• manalysis/MCT1ReadAscii.cc (modified) (2 diffs)
• mgui/MCamDisplay.cc (modified) (6 diffs)
• mgui/MCamDisplay.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -7 +7 @@
    * macros/tar.C:
      - implemented some sanity checks (existing files)
+
+   * mgui/MCamDisplay.[h,cc]:
+     - changed to use DeepSea palette in root versions newer than 3.01/05
+     - fixed a bug which caused the destructor to do strange thing
+       (the uncloned fGeomCam was deleted)
+     - implemented a more accurate deletion of the objects in the
+       TClonesArrays by using TClonesArray::Delete
+     - Implemented deletion of automatically created TCanvas
+     - Implemented a sanity check in Draw and DrawPhotNum
+
+   * macros/readCT1.C, macros/readMagic.C:
+     - changed to Handling of the gui and keyboard input
+     - implemented the filename as function argument
+
+   * manalysis/MCT1ReadAscii.cc:
+     - Expanded filename to support filnames containing '~'
 
 

trunk/MagicSoft/Mars/NEWS

@@ -75 +75 @@
      by unfolding
 
+   - changed the color palette in the camera display to DeapSea.
 
 

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -23 +23 @@
 \* ======================================================================== */
 
+Bool_t HandleInput()
+{
+    TTimer timer("gSystem->ProcessEvents();", 50, kFALSE);
+    while (1)
+    {
+        //
+        // While reading the input process gui events asynchronously
+        //
+        timer.TurnOn();
+        TString input = Getline("Type 'q' to exit, <return> to go on: ");
+        timer.TurnOff();
 
-void readCT1()
+        if (input=="q\n")
+            return kFALSE;
+
+        if (input=="\n")
+            return kTRUE;
+    };
+
+    return kFALSE;
+}
+
+void readCT1(const char *fname="~/data/CT1_97_on1.dat")
 {
     MParList plist;
@@ -36 +57 @@
     plist.AddToList(&tlist);
 
-    MCT1ReadAscii read("/home/tbretz/data/CT1_97_on1.dat");
+    MCT1ReadAscii read(fname);
     MClone        clone("MCerPhotEvt");
     MImgCleanStd  clean;
@@ -66 +87 @@
 
         display.DrawPhotNum(evt);
-        gClient->HandleInput();
-        if (getchar()=='q')
+
+        if (!HandleInput())
             break;
 
@@ -74 +95 @@
         display.DrawPhotNum((MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
-        gClient->HandleInput();
-        if (getchar()=='q')
+        if (!HandleInput())
             break;
     } 

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -24 +24 @@
 
 
-void readMagic()
+Bool_t HandleInput()
+{
+    TTimer timer("gSystem->ProcessEvents();", 50, kFALSE);
+    while (1)
+    {
+        //
+        // While reading the input process gui events asynchronously
+        //
+        timer.TurnOn();
+        TString input = Getline("Type 'q' to exit, <return> to go on: ");
+        timer.TurnOff();
+
+        if (input=="q\n")
+            return kFALSE;
+
+        if (input=="\n")
+            return kTRUE;
+    };
+
+    return kFALSE;
+}
+
+void readMagic(const char *fname="~/data/camera.root")
 {
     MParList plist;
@@ -36 +58 @@
     plist.AddToList(&tlist);
 
-    MReadMarsFile     read("Events", "~/data/camera.root");
+    MReadMarsFile     read("Events", fname);
 
     MMcPedestalCopy   pcopy;
@@ -71 +93 @@
         display.DrawPhotNum((MCerPhotEvt*)clone.GetClone());
 
-        gClient->HandleInput();
-        if(getchar()=='q')
+        if (!HandleInput())
             break;
 
@@ -80 +101 @@
         display.DrawPhotNum((MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
-        gClient->HandleInput();
-        if(getchar()=='q')
-        break;
+        if (!HandleInput())
+            break;
     } 
 
     evtloop.PostProcess();
-
 }
 
-
-
-

trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc

@@ -44 +44 @@
 
 #include <TList.h>
+#include <TSystem.h>
 
 #include "MLog.h"
@@ -124 +125 @@
     const char *name = file->GetName();
 
-    fIn = new ifstream(name);
+    fIn = new ifstream(gSystem->ExpandPathName(name));
 
     const Bool_t noexist = !(*fIn);

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -27 +27 @@
 //
 MCamDisplay::MCamDisplay(MGeomCam *geom)
-    : fAutoScale(kTRUE), fMinPhe(-2), fMaxPhe(50), fW(0), fH(0), fDrawingPad(NULL)
-{
-    fGeomCam = geom; // FIXME: Clone doesn't work! (MGeomCam*)geom->Clone();
+    : fAutoScale(kTRUE), fMinPhe(-2), fMaxPhe(50), fW(0), fH(0), fDrawingPad(NULL), fIsAllocated(kFALSE)
+{
+    fGeomCam = (MGeomCam*)geom; // FIXME: Clone doesn't work! (MGeomCam*)geom->Clone();
 
     //
@@ -53 +53 @@
     // set the color palette for the TBox elements
     //
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
     gStyle->SetPalette(1, 0);
+#else
+    gStyle->SetPalette(51, 0);
+#endif
 
     //
@@ -81 +85 @@
 MCamDisplay::~MCamDisplay()
 {
+    fPixels->Delete();
+    fLegend->Delete();
+    fLegText->Delete();
+
     delete fPixels;
     delete fLegend;
     delete fLegText;
 
-    delete fGeomCam;
+    // delete fGeomCam;
+
+    if (fIsAllocated)
+        delete fDrawingPad;
 }
 
@@ -157 +168 @@
     // gPad->SetFixedAspectRatio()
 
+    if (fDrawingPad)
+        return;
+
     //
     // if no canvas is yet existing to draw into, create a new one
     //
     if (!gPad)
+    {
         fDrawingPad = new TCanvas("CamDisplay", "Magic Camera Display", 0, 0, 750, 600);
+        fIsAllocated = kTRUE;
+    }
     else
+    {
         fDrawingPad = gPad;
+        fIsAllocated = kFALSE;
+    }
 
     fDrawingPad->SetBorderMode(0);
@@ -176 +196 @@
     // Setup the correct environment
     //
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
     gStyle->SetPalette(1, 0);
+#else
+    gStyle->SetPalette(51, 0);
+#endif
 
     gPad->SetFillColor(22);
@@ -220 +244 @@
 void MCamDisplay::DrawPhotNum(const MCerPhotEvt *event)
 {
+    if (!event)
+        return;
+
     if (!fDrawingPad)
         Draw();

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -38 +38 @@
     UInt_t         fH;           // Height of canvas
     TVirtualPad   *fDrawingPad;  // pad in which we are drawing
+    Bool_t         fIsAllocated;
 
     TBox  *GetBox(Int_t i)  { return (TBox*) fLegend->At(i); }