Changeset 1230 for trunk/examples/advanced/Rich

Timestamp:

Jan 8, 2010, 3:02:48 PM (14 years ago)

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/advanced/Rich

Files:

• GNUmakefile (modified) (2 diffs)
• History (modified) (2 diffs)
• RichTbSim.cc (modified) (5 diffs)
• include/RichTbGeometryParameters.hh (modified) (1 diff)

trunk/examples/advanced/Rich/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.1 2003/05/26 13:02:50 pmendez Exp $
+# $Id: GNUmakefile,v 1.2 2009/03/06 09:39:58 gbarrand Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
@@ -19 +19 @@
 include $(G4INSTALL)/config/architecture.gmk
 
-ifdef G4ANALYSIS_USE
-  CPPFLAGS += `aida-config --include`
-  LDFLAGS += `aida-config --lib`
-endif
 #
 .PHONY: all

trunk/examples/advanced/Rich/History

@@ -1 +1 @@
 -------------------------------------------------------------------
-$Id: History,v 1.11 2007/09/30 23:00:40 gum Exp $
+$Id: History,v 1.16 2009/11/12 13:09:56 ribon Exp $
 -------------------------------------------------------------------
 
@@ -9 +9 @@
                       Category History file
                       ---------------------
+
+12.11.2009 - A.Ribon (Rich-V09-02-01)
+             Added the possibility to use QGSP_BIC_EMY as 
+             Physics List. However, by default, the example's 
+             Physics List is used.
+
+08.04.2009 - G.A.P.Cirrone; Tag: Rich-V09-02-00
+             Tag for the next release
+
+06.03.2009 - Guy Barrand (in agreement with G.Cosmo)
+             GNUmakefile : remove the G4ANALYSIS_USE logic found in this file
+             since it is handled already in the config/analysis.gmk.
+             This avoids a duplication in the compilation and link commands
+             of the aida-config options.
+
+23.11.2008 - G.A.P.Cirrone; Tag: Rich-V09-01-01
+             Fixed compilation errors on the file RichTbEventAction
+
+14.06.2008 - G.A.P.Cirrone (Rich-V09-01-00)
+             Fixed compilation errors and removed warnigs
 
 30.09.2007 - P.Gumplinger (Rich-V09-00-00)

trunk/examples/advanced/Rich/RichTbSim.cc

@@ -44 +44 @@
 #include "G4UImanager.hh"
 #include "G4UIterminal.hh"
+#include "QGSP_BIC_EMY.hh"
+
 #ifdef G4UI_USE_XM
 #include "G4UIXm.hh"
 #endif
+
 #include "Randomize.hh"
+
 #ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
@@ -77 +81 @@
    runManager->SetUserInitialization(RichTbDet);
    
-   RichTbPhysicsList* RichTbPhy
-     =new RichTbPhysicsList(rConfig);
-
-   runManager-> SetUserInitialization(RichTbPhy);
-
+   //***LOOKHERE*** : Choose the Physics List
+   RichTbPhysicsList* RichTbPhy =new RichTbPhysicsList(rConfig);
+   runManager->SetUserInitialization(RichTbPhy);        // Use example's Physics List
+   //runManager->SetUserInitialization(new QGSP_BIC_EMY); // Use QGSP_BIC_EMY
    
 
 // UserAction classes - optional
 
+ #ifdef G4VIS_USE
   G4VisManager* visManager = new G4VisExecutive();
   visManager->SetVerboseLevel(0);
@@ -93 +97 @@
    G4cout<<" PVVisManager "<<pVVisManager<<G4endl;
    G4cout<<"VisManager "<<visManager<<G4endl;
+#endif
 
    runManager->SetUserAction(new RichTbRunAction);
@@ -101 +106 @@
    runManager->SetUserAction( PrimaryGenAction );
 
-   RichTbEventAction* eventAction=
-     new RichTbEventAction(rConfig,visManager,
-                           rIOData);
+ #ifdef G4VIS_USE
+   RichTbEventAction* eventAction=new RichTbEventAction(rConfig,visManager,rIOData);
+#endif
+
+ #ifndef G4VIS_USE
+   RichTbEventAction* eventAction=new RichTbEventAction(rConfig,0,rIOData);
+#endif
 
    runManager->SetUserAction(eventAction);
@@ -146 +155 @@
 #ifdef G4VIS_USE
   delete visManager;
+  G4cout << "\nVisManager deleted..\n" <<G4endl;
 #endif
-
-  G4cout << "\nVisManager deleted..\n" <<G4endl;
 
    delete runManager;

trunk/examples/advanced/Rich/include/RichTbGeometryParameters.hh

@@ -373 +373 @@
 static const G4int NumberOfHpds=4;
 static const G4double HpdPosRad=146.5*mm;
-static const G4double HpdZfromEnd=HpdMasterHalfZ-VesselPosZ+1.0*mm;;
+static const G4double HpdZfromEnd=HpdMasterHalfZ-VesselPosZ+1.0*mm;
 
 static const  G4double HpdMasterPosX[NumberOfHpds]=