Changeset 7184

Timestamp:

07/13/05 15:34:23 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MTaskInteractive.cc (modified) (1 diff)
• mbase/MTaskInteractive.h (modified) (2 diffs)
• sinope.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mbase/MTaskInteractive.cc

@@ -75 +75 @@
 //
 MTaskInteractive::MTaskInteractive(const char *name, const char *title) :
-    fPreProcess(NULL), fProcess(NULL), fPostProcess(NULL)
+    fPreProcess(NULL), fProcess(NULL), fPostProcess(NULL), fReInit(NULL)
 {
     fName  = name  ? name  : "MTaskInteractive";

trunk/MagicSoft/Mars/mbase/MTaskInteractive.h

@@ -22 +22 @@
     Int_t  Process()                  { if (fCall[1]) return Return(1);        return fProcess     ? (*fProcess)()        : kTRUE; }
     Int_t  PostProcess()              { if (fCall[2]) return Return(2);        return fPostProcess ? (*fPostProcess)()    : kTRUE; }
-    Bool_t ReInit(MParList *list)     { if (fCall[3]) return Return(3, &list); return fPostProcess ? (*fPostProcess)()    : kTRUE; }
+    Bool_t ReInit(MParList *list)     { if (fCall[3]) return Return(3, &list); return fReInit      ? (*fReInit)(list)     : kTRUE; }
 
     Int_t Return(Int_t no, void *param=NULL);
@@ -33 +33 @@
 
     // This is to be used in compiled code
-    void SetPreProcess(Int_t (*func)(MParList *list)) { fPreProcess = func;  Free(0); }
-    void SetProcess(Int_t (*func)())                  { fProcess = func;     Free(1); }
+    void SetPreProcess(Int_t (*func)(MParList *list)) { fPreProcess  = func; Free(0); }
+    void SetProcess(Int_t (*func)())                  { fProcess     = func; Free(1); }
     void SetPostProcess(Int_t (*func)())              { fPostProcess = func; Free(2); }
-    void SetReInit(Bool_t (*func)(MParList *list))    { fReInit = func;      Free(3); }
+    void SetReInit(Bool_t (*func)(MParList *list))    { fReInit      = func; Free(3); }
 
     // This is for usage in CINT

trunk/MagicSoft/Mars/sinope.cc

@@ -135 +135 @@
     //MStatusDisplay *d = new MStatusDisplay;
     d->AddTab("Time");
-    h1.DrawClone();
+    h1.DrawCopy();
     l.DrawLine(h1.GetMaximumBin()-1, 0, h1.GetMaximumBin()-1, h1.GetMaximum());
     const Int_t fwhm1  = GetFWHM(h1, min, max);
@@ -141 +141 @@
     l.DrawLine(min-1, h1.GetMaximum()/2, max-1, h1.GetMaximum()/2);
     gPad->Update();
+
     d->AddTab("Pulse");
-    h2.DrawClone();
+    h2.DrawCopy();
     l.DrawLine(h2.GetMaximumBin()-1, 0, h2.GetMaximumBin()-1, h2.GetMaximum());
     const Int_t fwhm2  = GetFWHM(h2, min, max);
@@ -170 +171 @@
     fout << "HeightAsym:     " << (asym2?"Yes":"No") << endl;
     fout << endl;
-
 
     return kTRUE;
@@ -428 +428 @@
     }
 
-    tlist.PrintStatistics();
-
     if (kBatch || kQuit)
         delete d;