Changeset 1916

Timestamp:

04/07/03 18:30:43 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mdatacheck/MGDisplayAdc.cc (modified) (5 diffs)
• mhist/MHFadcCam.cc (modified) (1 diff)
• mhist/MHFadcCam.h (modified) (2 diffs)
• mmain/MDataCheck.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -42 +42 @@
      - changed naming style of variables
      - changes array access
+
+   * mhist/MHFadcCam.[h,cc]:
+     - added HasHi
+     - added Exists
+
+   * mmain/MDataCheck.cc:
+     - removed unimplemented buttons
+
+   * mdatacheck/MGDisplayAdc.[h,cc]:
+     - tried to implement some unimplemented buttons
+     - don't display non existing (empty) histograms in list
 
 

trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc

@@ -26 +26 @@
 #include "MGDisplayAdc.h"
 
+#include <stdlib.h>              // mkstemp
 #include <iostream.h>            // cout for debugging
 
+#include <TSystem.h>             // gSystem
+#include <TCanvas.h>             // TCanvas.h
+#include <TGSlider.h>            // TGVSlider
 #include <TGButton.h>            // TGTextButton
-#include <TCanvas.h>             // TCanvas.h
 #include <TGMsgBox.h>            // TGMsgBox
 #include <TGListBox.h>           // TGListBox
-#include <TGSlider.h>            // TGVSlider
 #include <TGButtonGroup.h>       // TGVButtonGroup
 #include <TRootEmbeddedCanvas.h> // TRootEmbeddedCanvas
@@ -302 +304 @@
 
     for (Int_t i=0; i<nhi; i++)
-        fHistoList->AddEntry(fHists->GetHistHi(i)->GetName(), i+1);
+        if (fHists->Exists(i))
+            fHistoList->AddEntry(fHists->GetHistHi(i)->GetName(), i+1);
 
     fHistoList->MapSubwindows();
@@ -323 +326 @@
 
     fCanvas->Clear();
+
+    if (!fHists->Exists(selected-1))
+        return;
 
     const Int_t type = fHists->HasLo(selected-1) ? fHistoType : M_RADIO_HI;
@@ -372 +378 @@
             {
             case M_BUTTON_SAVE:
-                cout << "Sorry, not yet implemented!" << endl;
+                fCanvas->SaveAs();
+                cout << "Sorry, no well implemented!" << endl;
                 return kTRUE;
 
             case M_BUTTON_PRINT:
-                cout << "Sorry, not yet implemented!" << endl;
+                {
+                    char *txt = (char*)"canvasXXXXXX";
+                    mkstemp(txt);
+                    TString name = txt;
+                    name += ".ps";
+                    fCanvas->SaveAs(name);
+                    cout << "Calling 'lpr " << name << ".ps'" << endl;
+                    gSystem->Exec(TString("lpr ")+name+".ps");
+                    gSystem->Exec(TString("rm ")+name+".ps");
+                }
+                cout << "Sorry, not well implemented!" << endl;
                 return kTRUE;
 
@@ -426 +443 @@
             return kTRUE;
 
-        // Check for the slider movement and sicronise with TGListBox
+        // Check for the slider movement and synchronise with TGListBox
         if (parm2<1 || parm2>577)
             return kTRUE;

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -130 +130 @@
 {
     for (Int_t i=0; i<577; i++)
-    {
-        GetHistHi(i)->Reset();
-        GetHistLo(i)->Reset();
-    }
+        Reset(i);
 }
+
+void MHFadcCam::Reset(Int_t i)
+{
+    GetHistHi(i)->Reset();
+    GetHistLo(i)->Reset();
+}

trunk/MagicSoft/Mars/mhist/MHFadcCam.h

@@ -49 +49 @@
 
     void ResetHistograms();
+    void Reset(Int_t i);
 
     //
@@ -57 +58 @@
 
     Bool_t HasLo(UInt_t i) const { return GetHistLo(i)->GetEntries()>0; }
+    Bool_t HasHi(UInt_t i) const { return GetHistHi(i)->GetEntries()>0; }
+
+    Bool_t Exists(UInt_t i) const { return HasLo(i) && HasHi(i); }
 
     void DrawPix(UInt_t i)     { (*this)[i].Draw(); }

trunk/MagicSoft/Mars/mmain/MDataCheck.cc

@@ -58 +58 @@
 : MBrowser(/*main,*/ p, w, h)
 {
-    TGTextButton *pedadc = new TGTextButton(fTop1, "ADC Spectra of Pedestals", kButPedAdc);
+    //TGTextButton *pedadc = new TGTextButton(fTop1, "ADC Spectra of Pedestals", kButPedAdc);
     TGTextButton *cradc  = new TGTextButton(fTop1, "ADC Spectra of Cosmics",    kButEvtAdc);
-    TGTextButton *pedtdc = new TGTextButton(fTop3, "Run Spectra of Pedestals", kButPedTdc);
-    TGTextButton *crtdc  = new TGTextButton(fTop3, "Run Spectra of Cosmics",    kButEvtTdc);
-
-    pedadc->Associate(this);
+    //TGTextButton *pedtdc = new TGTextButton(fTop3, "Run Spectra of Pedestals", kButPedTdc);
+    //TGTextButton *crtdc  = new TGTextButton(fTop3, "Run Spectra of Cosmics",    kButEvtTdc);
+
+    //pedadc->Associate(this);
     cradc ->Associate(this);
-    pedtdc->Associate(this);
-    crtdc ->Associate(this);
-
-    fList->Add(pedadc);
+    //pedtdc->Associate(this);
+    //crtdc ->Associate(this);
+
+    //fList->Add(pedadc);
     fList->Add(cradc);
-    fList->Add(pedtdc);
-    fList->Add(crtdc);
+    //fList->Add(pedtdc);
+    //fList->Add(crtdc);
 
     TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsLeft, 10, 10, 5, 5);
     fList->Add(laybut);
 
-    fTop1->AddFrame(pedadc, laybut);
+    //fTop1->AddFrame(pedadc, laybut);
     fTop1->AddFrame(cradc,  laybut);
 
-    fTop3->AddFrame(pedtdc, laybut);
-    fTop3->AddFrame(crtdc,  laybut);
+    //fTop3->AddFrame(pedtdc, laybut);
+    //fTop3->AddFrame(crtdc,  laybut);
 
     MapSubwindows();