Changeset 2551 for trunk/MagicSoft

Timestamp:

11/21/03 17:51:54 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MFillH.cc (modified) (1 diff)
• mhist/MFillH.h (modified) (1 diff)
• mhist/MH.h (modified) (1 diff)
• status.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -12 +12 @@
    * status.cc:
      - added display of average index of slice witg maximum value
+     - implemented a scheme to exit the application and to 
+       leave it open when the loop is finished.
+       
+   * macros/status.C:
+     - added maximum index histogram
+     
+   * mbase/MStatusDisplay.[h,cc]:
+     - implemented kExitLoopOnExit and kExitLoopOnClose
+     
+   * mcamera/CameraLinkDef.h:
+     - added missing MCameraAUX and MCameraLid
+     
+   * mhist/MHCamEvent.[h,cc]:
+     - added fRms
+     
+   * mhist/MHCamera.cc:
+     - added error when printing pixel contents
+     
+   * mhist/MHTriggerLvl0.[h,cc]:
+     - use MHCamera::kProfile
+     - renamed PrintOutLayers to PrintOutliers
+     
+   * mmain/MEventDisplay.cc:
+     - made 'Mini-Canvas' working in all Tabs by catching kCM_TAB
 
 

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -470 +470 @@
 // --------------------------------------------------------------------------
 //
+// Call the ReInit function of the contained Histogram
+//
+Bool_t MFillH::ReInit(MParList *pList)
+{
+    return fH->ReInit(pList);
+} 
+
+// --------------------------------------------------------------------------
+//
 // Fills the data from the parameter conatiner into the histogram container
 //

trunk/MagicSoft/Mars/mhist/MFillH.h

@@ -59 +59 @@
     void SetWeight(const char *name) { fWeightName = name; }
 
-    Int_t PreProcess(MParList *pList);
-    Int_t Process();
-    Int_t PostProcess();
+    Int_t  PreProcess(MParList *pList);
+    Bool_t ReInit(MParList *pList);
+    Int_t  Process();
+    Int_t  PostProcess();
 
     TCanvas *GetCanvas() { return fCanvas; }

trunk/MagicSoft/Mars/mhist/MH.h

@@ -31 +31 @@
     TString AddSerialNumber(const TString &str) const { return AddSerialNumber((const char*)str); }
 
-
     Bool_t OverwritesDraw(TClass *cls=NULL) const;
 
     virtual Bool_t SetupFill(const MParList *pList) { return kTRUE; }
+    virtual Bool_t ReInit(MParList *pList) { return kTRUE; }
     virtual Bool_t Fill(const MParContainer *par, const Stat_t weight=1);
     virtual Bool_t Finalize() { return kTRUE; }

trunk/MagicSoft/Mars/status.cc

@@ -149 +149 @@
     //
     MStatusDisplay *d = new MStatusDisplay;
+
+    // From now on each 'Exit' means: Terminate the application
+    d->SetBit(MStatusDisplay::kExitLoopOnExit);
 
     // Set update time to 5s
@@ -299 +302 @@
     tlist.PrintStatistics();
 
+    if (!evtloop.GetDisplay())
+        return 0;
+
+    // From now on each 'Close' means: Terminate the application
+    d->SetBit(MStatusDisplay::kExitLoopOnClose);
+
+    // Wait until the user decides to exit the application
+    app.Run(kFALSE);
     return 0;
 }