Import Geant4 9.6.0 source tree

examples/basic/B2/B2b/CMakeLists.txt

@@ -44,7 +44,9 @@ target_link_libraries(exampleB2b ${Geant4_LIBRARIES})
 set(EXAMPLEB2B_SCRIPTS
   exampleB2b.out
   exampleB2.in
+  icons.mac
   gui.mac
+  run.png
   init.mac
   init_vis.mac
   run1.mac

examples/basic/B2/B2b/gui.mac

@@ -1,12 +1,16 @@
 #
-#  This file permits to customize, with commands,
+# This file permits to customize, with commands,
 # the menu bar of the G4UIXm, G4UIQt, G4UIWin32 sessions.
 # It has no effect with G4UIterminal.
 #
-# File :
-/gui/addMenu g4file G4File
-/gui/addButton g4file Continue continue
-/gui/addButton g4file Exit "exit"
+#
+# Add icons of general interest
+#
+/control/execute icons.mac
+#
+# File menu :
+/gui/addMenu file File
+/gui/addButton file Quit exit
 #
 # Run menu :
 /gui/addMenu run Run
@@ -39,3 +43,6 @@
 /gui/addButton viewer "Update viewer (interaction or end-of-file)" "/vis/viewer/update"
 /gui/addButton viewer "Flush viewer (= refresh + update)" "/vis/viewer/flush"
 /gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
+#
+# User defined icon :
+/gui/addIcon "Run beam on" user_icon "/run/beamOn 1" run.png 

examples/basic/B2/B2b/icons.mac

@@ -0,0 +1,26 @@
+#
+# This file permits to customize, with commands,
+# the icon menu bar of the G4UIQt sessions not yet implemented other UI drivers (geant4-09-05-ref-09)
+# It has no effect with G4UIterminal.
+
+# open/save icons
+/gui/addIcon "Open macro file" open /control/execute
+/gui/addIcon "Save viewer state" save /vis/viewer/save
+
+# Cursors style icons 
+/gui/addIcon "Move" move 
+/gui/addIcon "Pick" pick 
+/gui/addIcon "Zoom out" zoom_out 
+/gui/addIcon "Zoom in" zoom_in 
+/gui/addIcon "Rotate" rotate 
+
+# Surface Style icons
+# Surface Style icons
+/gui/addIcon "Hidden line removal" hidden_line_removal 
+/gui/addIcon "Hidden line and hidden surface removal" hidden_line_and_surface_removal 
+/gui/addIcon "Surfaces" solid 
+/gui/addIcon "Wireframe" wireframe 
+
+# Perspective/Ortho icons
+/gui/addIcon "Perspective" perspective 
+/gui/addIcon "Orthographic" ortho 

examples/basic/B2/B2b/src/B2PrimaryGeneratorAction.cc

@@ -37,6 +37,7 @@
 #include "G4ParticleGun.hh"
 #include "G4ParticleTable.hh"
 #include "G4ParticleDefinition.hh"
+#include "G4SystemOfUnits.hh"
 
 #include "Randomize.hh"
 

examples/basic/B2/B2b/src/B2TrackerHit.cc

@@ -91,7 +91,7 @@ void B2TrackerHit::Draw()
   if(pVVisManager)
   {
     G4Circle circle(fPos);
-    circle.SetScreenSize(2.);
+    circle.SetScreenSize(4.);
     circle.SetFillStyle(G4Circle::filled);
     G4Colour colour(1.,0.,0.);
     G4VisAttributes attribs(colour);

examples/basic/B2/B2b/src/B2TrackerSD.cc

@@ -87,7 +87,6 @@ G4bool B2TrackerSD::ProcessHits(G4Step* aStep,
   fHitsCollection->insert( newHit );
 
   //newHit->Print();
-  //newHit->Draw();
 
   return true;
 }

examples/basic/B2/B2b/src/B2bChamberParameterisation.cc

@@ -33,6 +33,7 @@
 #include "G4VPhysicalVolume.hh"
 #include "G4ThreeVector.hh"
 #include "G4Tubs.hh"
+#include "G4SystemOfUnits.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 

examples/basic/B2/B2b/src/B2bDetectorConstruction.cc

@@ -53,6 +53,8 @@
 #include "G4VisAttributes.hh"
 #include "G4Colour.hh"
 
+#include "G4SystemOfUnits.hh"
+
 //#include "G4ios.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -224,7 +226,7 @@ G4VPhysicalVolume* B2bDetectorConstruction::DefineVolumes()
                                   chamberWidth,  // chamber width
                                   firstLength,    // initial length 
                                   lastLength);    // final length
-			   
+                           
   // dummy value : kZAxis -- modified by parameterised volume
 
   new G4PVParameterised("Chamber",       // their name
@@ -238,7 +240,7 @@ G4VPhysicalVolume* B2bDetectorConstruction::DefineVolumes()
   G4cout << "There are " << NbOfChambers << " chambers in the tracker region. "
          << "\nThe chambers are " << chamberWidth/cm << " cm of " 
          << fChamberMaterial->GetName() << "\nThe distance between chamber is "
-	 << chamberSpacing/cm << " cm" << G4endl;
+         << chamberSpacing/cm << " cm" << G4endl;
 
   // Sensitive detectors
 

examples/basic/B2/B2b/vis.mac

@@ -53,7 +53,7 @@
 # (if too many tracks cause core dump => /tracking/storeTrajectory 0)
 #
 # Draw hits at end of event:
-#/vis/scene/add/hits
+/vis/scene/add/hits
 #
 # To draw only gammas:
 #/vis/filtering/trajectories/create/particleFilter