Import Geant4 10.5.0.beta source tree

examples/extended/exoticphysics/phonon/CTestDefinitions.txt

@@ -13,6 +13,8 @@ if(GEANT4_BUILD_MULTITHREADED)
     set(_MTsuffix "-MT")
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
     set(_MTsuffix "-clang-MT")
+  elseif(MSVC)
+    set(_MTsuffix "-win-MT") 
   endif()
 endif()
 

examples/extended/exoticphysics/phonon/History

@@ -1,4 +1,4 @@
-$Id: History 107810 2017-12-04 15:58:40Z gcosmo $
+$Id: History 110889 2018-06-25 06:19:53Z gcosmo $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,22 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+24 June 2018 G.Folger        (phononExample-V10-04-03)
+- Correct Windows specific references for windows line ends
+
+21 June 2018 G.Folger        (phononExample-V10-04-02)
+- Add references specific for Windows-MT
+
+17 May 2018 J.Allison        (phononExample-V10-04-01)
+- Add #include "G4Types.hh"
+- Remove G4UI_USE and G4VIS_USE.
+- Move instantiation of G4UIExecutive to start of main.
+
+21 March 2018 G.Folger       (phononExample-V10-04-00)
+-  update references for caustic and timing
+     changed caused by new CLHEP 2.4.0.4 with changes in random 
+
+
 4 December 2017 G.Folger     (phononExample-V10-03-08)
 - fix typo in caustic.out-clang-MT, it had extra \n at end.
 

examples/extended/exoticphysics/phonon/XGeBox.cc

@@ -26,9 +26,11 @@
 /// \file exoticphysics/phonon/XGeBox.cc
 /// \brief Main program of the exoticphysics/phonon example
 //
-// $Id: XGeBox.cc 84197 2014-10-10 14:33:03Z gcosmo $
+// $Id: XGeBox.cc 110254 2018-05-17 14:14:23Z gcosmo $
 //
 
+#include "G4Types.hh"
+
 #include "G4UImanager.hh"
 #include "G4UserSteppingAction.hh"
 
@@ -38,13 +40,8 @@
 #include "G4RunManager.hh"
 #endif
 
-#ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
-#endif
-
-#ifdef G4UI_USE
 #include "G4UIExecutive.hh"
-#endif
 
 #include "XActionInitialization.hh"
 #include "XDetectorConstruction.hh"
@@ -54,6 +51,13 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 int main(int argc,char** argv) {
+
+ // Instantiate G4UIExecutive if interactive mode
+ G4UIExecutive* ui = nullptr;
+ if ( argc == 1 ) {
+   ui = new G4UIExecutive(argc, argv);
+ }
+
  // Construct the run manager
  //
 #ifdef G4MULTITHREADED
@@ -75,13 +79,11 @@ int main(int argc,char** argv) {
  //
  runManager->SetUserInitialization(new XActionInitialization);
 
-#ifdef G4VIS_USE
  // Visualization manager
  //
  G4VisManager* visManager = new G4VisExecutive;
  visManager->Initialize();
-#endif
-    
+
  // Initialize G4 kernel (replaces /run/initialize macro command)
  //
  runManager->Initialize();
@@ -90,16 +92,11 @@ int main(int argc,char** argv) {
  //
  G4UImanager* UImanager = G4UImanager::GetUIpointer();  
 
- if (argc==1)   // Define UI session for interactive mode
+ if (ui)   // Define UI session for interactive mode
  {
-#ifdef G4UI_USE
-      G4UIExecutive * ui = new G4UIExecutive(argc,argv);
-#ifdef G4VIS_USE
       UImanager->ApplyCommand("/control/execute vis.mac");
-#endif
       ui->SessionStart();
       delete ui;
-#endif
  }
  else           // Batch mode
  {
@@ -108,9 +105,7 @@ int main(int argc,char** argv) {
    UImanager->ApplyCommand(command+fileName);
  }
 
-#ifdef G4VIS_USE
  delete visManager;
-#endif
  delete runManager;
 
  return 0;

examples/extended/exoticphysics/phonon/caustic.out-clang-MT

@@ -1,5 +1,6 @@
--36.9773,-9.18101,-2.30047
-3.74678,-11.7797,12.7
-12.3251,10.3106,-12.7
-2.66145,-0.647826,-12.7
--0.878124,-5.97534,12.7
+10.0632,-8.86304,12.7
+-18.12,6.8066,12.7
+12.4047,-3.15044,12.7
+25.8628,27.9772,8.91
+5.31685,5.00029,-12.7
+9.88462,-8.41006,12.7

examples/extended/exoticphysics/phonon/caustic.out-win-MT

@@ -0,0 +1,5 @@
+2.06581,-4.83672,12.7
+37.5712,6.32569,-5.04869
+13.2864,14.4323,-12.7
+-0.89924,1.97514,12.7
+-4.7837,7.49786,-12.7

examples/extended/exoticphysics/phonon/phonon.out

@@ -4,7 +4,7 @@
         ############################################
 
 **************************************************************
- Geant4 version Name: geant4-10-04-patch-02    (25-May-2018)
+ Geant4 version Name: geant4-10-05-beta-01    (29-June-2018)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278

examples/extended/exoticphysics/phonon/timing.out-clang-MT

@@ -1,5 +1,6 @@
-25482.8 0.0009196
-37013.1 0.000656883
-23009.8 0.00140291
-178693 0.00221071
-54113.9 0.00230991
+11672.1 0.00147344
+21667.6 0.00118218
+26231.2 0.00158908
+30904.1 0.000828324
+32060.5 0.00118923
+40886.5 0.00123774

examples/extended/exoticphysics/phonon/timing.out-win-MT

@@ -0,0 +1,5 @@
+9158.81 0.00124825
+52408.8 0.0011196
+42333.3 0.000720072
+73669.4 0.00168229
+75722.3 0.00272978