Import Geant4 10.2.0 source tree

examples/advanced/ChargeExchangeMC/include/CexmcHistoManager.hh

@@ -53,10 +53,13 @@
 #include "CexmcAngularRange.hh"
 #include "CexmcCommon.hh"
 
-class  TFile;
+class  TDirectoryFile;
 class  TH1;
 #ifdef CEXMC_USE_ROOTQT
 class  TQtWidget;
+class  TList;
+class  G4UIsession;
+class  G4UIQt;
 #endif
 class  CexmcHistoManagerMessenger;
 
@@ -216,6 +219,17 @@ class  CexmcHistoManager
 #ifdef CEXMC_USE_ROOTQT
         void  Draw( const G4String &  histoName,
                     const G4String &  histoDrawOptions = "" );
+
+        void  EnableLiveHistograms( G4UIsession *  session, G4bool  on = true );
+
+        void  AddHistoMenu( const G4String &  handle,
+                            const G4String &  label = "Histograms" );
+
+        void  SetDrawOptions1D( const G4String &  value );
+
+        void  SetDrawOptions2D( const G4String &  value );
+
+        void  SetDrawOptions3D( const G4String &  value );
 #endif
 
     public:
@@ -232,8 +246,16 @@ class  CexmcHistoManager
                            const G4String &  title,
                            const CexmcHistoAxes &  axes );
 
+#ifdef CEXMC_USE_ROOTQT
+        void  BuildMenuTree( G4UIQt *  session, const G4String &  menu,
+                             TList *  ls );
+
+        void  AddSubmenu( G4UIQt *  session, const G4String &  parent,
+                          const G4String &  name, const G4String &  label );
+#endif
+
     private:
-        TFile *                       outFile;
+        TDirectoryFile *              outFile;
 
     private:
         CexmcHistosMap                histos;
@@ -252,8 +274,21 @@ class  CexmcHistoManager
 
 #ifdef CEXMC_USE_ROOTQT
     private:
-
         TQtWidget *                   rootCanvas;
+
+        G4bool                        areLiveHistogramsEnabled;
+
+        G4bool                        isHistoMenuInitialized;
+
+        G4String                      drawOptions1D;
+
+        G4String                      drawOptions2D;
+
+        G4String                      drawOptions3D;
+
+        G4String                      histoMenuHandle;
+
+        G4String                      histoMenuLabel;
 #endif
 
     private:
@@ -275,6 +310,32 @@ inline G4int  CexmcHistoManager::GetVerboseLevel( void ) const
     return verboseLevel;
 }
 
+
+inline void  CexmcHistoManager::AddHistoMenu( const G4String &  handle,
+                                              const G4String &  label )
+{
+    histoMenuHandle = handle;
+    histoMenuLabel = label;
+}
+
+
+inline void  CexmcHistoManager::SetDrawOptions1D( const G4String &  value )
+{
+    drawOptions1D = value;
+}
+
+
+inline void  CexmcHistoManager::SetDrawOptions2D( const G4String &  value )
+{
+    drawOptions2D = value;
+}
+
+
+inline void  CexmcHistoManager::SetDrawOptions3D( const G4String &  value )
+{
+    drawOptions3D = value;
+}
+
 #endif
 
 #endif

examples/advanced/ChargeExchangeMC/include/CexmcHistoManagerMessenger.hh

@@ -77,6 +77,14 @@ class  CexmcHistoManagerMessenger : public G4UImessenger
 
 #ifdef CEXMC_USE_ROOTQT
         G4UIcmdWithAString *       drawHisto;
+
+        G4UIcmdWithAString *       addHistoMenu;
+
+        G4UIcmdWithAString *       drawHistoOptions1D;
+
+        G4UIcmdWithAString *       drawHistoOptions2D;
+
+        G4UIcmdWithAString *       drawHistoOptions3D;
 #endif
 };
 

examples/advanced/ChargeExchangeMC/include/CexmcHistoWidget.hh

@@ -54,6 +54,9 @@ class  QContextMenuEvent;
 
 class  CexmcHistoWidget : public TQtWidget
 {
+    public:
+        CexmcHistoWidget();
+
     public:
         void  contextMenuEvent( QContextMenuEvent *  event );
 };

examples/advanced/ChargeExchangeMC/include/CexmcRunManager.hh

@@ -114,8 +114,6 @@ class  CexmcRunManager : public G4RunManager
 #endif
 #endif
 
-        void  EnableLiveHistograms( G4bool  on = true );
-
         void  BeamParticleChangeHook( void );
 
         void  SetupConstructionHook( void );
@@ -145,8 +143,6 @@ class  CexmcRunManager : public G4RunManager
         boost::archive::binary_oarchive *  GetFastEventsArchive( void ) const;
 #endif
 
-        G4bool                    AreLiveHistogramsEnabled( void ) const;
-
         CexmcEventDataVerboseLevel  GetEventDataVerboseLevel( void ) const;
 
     protected:
@@ -191,8 +187,6 @@ class  CexmcRunManager : public G4RunManager
 
         CexmcEventCountPolicy       eventCountPolicy;
 
-        G4bool                      areLiveHistogramsEnabled;
-
         G4bool                      skipInteractionsWithoutEDTonWrite;
 
         CexmcEventDataVerboseLevel  evDataVerboseLevel;
@@ -385,18 +379,6 @@ inline void  CexmcRunManager::SkipInteractionsWithoutEDTonWrite( G4bool  on )
 #endif
 
 
-inline void  CexmcRunManager::EnableLiveHistograms( G4bool  on )
-{
-    areLiveHistogramsEnabled = on;
-}
-
-
-inline G4bool  CexmcRunManager::AreLiveHistogramsEnabled( void ) const
-{
-    return areLiveHistogramsEnabled;
-}
-
-
 inline CexmcEventDataVerboseLevel  CexmcRunManager::GetEventDataVerboseLevel(
                                                                     void ) const
 {