Revert of a harmful change (A.Goel)

[u/mrichter/AliRoot.git] / TPC / AliTPCCalibViewerGUI.h

diff --git a/TPC/AliTPCCalibViewerGUI.h b/TPC/AliTPCCalibViewerGUI.h
index 56bb45438285f96e9930bdaee2211ecdcd362bb7..93dd9385a78a6f0b53f17ba9f89b11c9866699bd 100644 (file)
--- a/TPC/AliTPCCalibViewerGUI.h
+++ b/TPC/AliTPCCalibViewerGUI.h
@@ -29,9 +29,11 @@
 #include <TGButtonGroup.h>
 #include <TGLabel.h>
 #include <TGTab.h>
+#include <TString.h>
 class TROOTt;
 class AliTPCCalibViewer;
 class AliTPCPreprocessorOnline;
+class TGTextEntry;
 
 
 // class TGListBox;
@@ -61,20 +63,27 @@ public:
    
    void DrawGUI(const TGWindow *p, UInt_t w, UInt_t h);         // to be called by the costructor, here the windows is drawn
    void SetInitialValues();                                     // set the initial button states
-   void Initialize(char* fileName, char* treeName = "calPads"); // initializes the GUI with default settings and opens tree for drawing
+   void Initialize(const char* fileName, const char* treeName = "calPads"); // initializes the GUI with default settings and opens tree for drawing
    void Initialize(AliTPCCalibViewer *viewer);                  // initializes the GUI with default settings and opens tree for drawing
    void Reload(){Initialize(fViewer);}                          // reload the viewr after it has been changed, e.g. added a new referenceTree, ...
+   void Reset();
    TString* GetDrawString();                                    // create the draw string out of selection
    TString* GetCutString();                                     // create the cut string out of selection
    TString* GetSectorString();                                  // create the sector string out of selection
    AliTPCCalibViewer* GetViewer() {return fViewer;}             // returns the internal AliTPCCalibViewer object, which does the work
    static TObjArray* ShowGUI(const char* fileName = 0);             // initialize and show GUI for presentation, standalone
-   
+  //
+  TGTextEntry* GetDrawEntry() {return fComboCustom->GetTextEntry();}
+  TGTextEntry* GetCutsEntry() {return fComboAddCuts->GetTextEntry();}
+  TGTextEntry* GetDrawOptEntry() {return fComboAddDrawOpt->GetTextEntry();}
+  TGTextEntry* GetFitEntry()  {return fComboCustomFit->GetTextEntry();}
+  //
    void HandleButtonsGeneral(Int_t id = -1); // handles mutual radio button exclusions for general Tab
    void HandleButtons1D(Int_t id = -1);      // handles mutual radio button exclusions for 1D Tab
    void HandleButtonsStat(Int_t id = -1);    // handles statistic check boxes 
    void HandleButtonsCuts(Int_t id = -1);    // handles mutual radio button exclusions for right side
    void HandleButtonsNoRedraw(Int_t id = -1);// handles label & scaling checkboxes without redrawing
+   void ReplacePlaceHolders(TString &str);   // replace place holders of the draw variable and normalisation variable
    void DoNewSelection();                    // decides whether to redraw if user makes another selection
    void DoDraw();                            // main method for drawing according to user selection
    void DoFit();                             // main method for fitting
@@ -134,6 +143,7 @@ protected:
    TGRadioButton       *fRadioTPC;           // TPC radio button
    TGRadioButton       *fRadioSideA;         // side A radio button
    TGRadioButton       *fRadioSideC;         // side C radio button
+   TGRadioButton       *fRadioROC;           // ROC radio button
    TGRadioButton       *fRadioSector;        // sector radio button
    TGComboBox          *fComboAddDrawOpt;    // additional draw options combo box
    TGCheckButton       *fChkAuto;            // automatic redraw checkbox