From ba31e1f8a13a5873180e146f356da4c62ae091b6 Mon Sep 17 00:00:00 2001
From: Kamil Sedlak <kamil.sedlak@psi.ch>
Date: Wed, 18 Jan 2012 14:57:59 +0000
Subject: [PATCH] 18.1.2012  Kamil Sedlak Changes needed for the upgrade of
 Geant to version 4.9.5.

---
 musrSim.cc                        |  2 +-
 src/musrPhysicsList.cc            | 75 +++++++++++++++----------------
 src/musrPrimaryGeneratorAction.cc |  2 +-
 3 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/musrSim.cc b/musrSim.cc
index 89b32c8..55e4853 100644
--- a/musrSim.cc
+++ b/musrSim.cc
@@ -39,7 +39,7 @@
 
 int main(int argc,char** argv) {
 
-  XInitThreads();
+  //  XInitThreads();
   G4cout<<"\n\n*************************************************************"<<G4endl;
   G4cout<<" musrSim version 1.0.2 released on 20 May 2011"<<G4endl;
   G4cout<<"      WWW:  http://lmu.web.psi.ch/simulation/index.html"<<G4endl;
diff --git a/src/musrPhysicsList.cc b/src/musrPhysicsList.cc
index f7b98bb..aa40a46 100644
--- a/src/musrPhysicsList.cc
+++ b/src/musrPhysicsList.cc
@@ -233,29 +233,28 @@ void musrPhysicsList::ConstructProcess()
 
 //#include "musrAtRestSpinRotation.hh"
 
-// For low energy physics processes:
-#include "G4LowEnergyCompton.hh"
-//#include "G4LowEnergyPolarizedCompton.hh"
-#include "G4LowEnergyGammaConversion.hh"
-#include "G4LowEnergyPhotoElectric.hh"
-#include "G4LowEnergyRayleigh.hh"
-#include "G4LowEnergyBremsstrahlung.hh"
-#include "G4LowEnergyIonisation.hh"
-#include "G4hLowEnergyIonisation.hh"
+//cks 14.12.2011  // For low energy physics processes:
+//cks 14.12.2011  #include "G4LowEnergyCompton.hh"
+//cks 14.12.2011  //#include "G4LowEnergyPolarizedCompton.hh"
+//cks 14.12.2011  #include "G4LowEnergyGammaConversion.hh"
+//cks 14.12.2011  #include "G4LowEnergyPhotoElectric.hh"
+//cks 14.12.2011  #include "G4LowEnergyRayleigh.hh"
+//cks 14.12.2011  #include "G4LowEnergyBremsstrahlung.hh"
+//cks 14.12.2011  #include "G4LowEnergyIonisation.hh"
+//cks 14.12.2011  #include "G4hLowEnergyIonisation.hh"
 
-
-// For Penelope processes:
-#include "G4PenelopeCompton.hh"
-#include "G4PenelopeGammaConversion.hh"
-#include "G4PenelopePhotoElectric.hh"
-#include "G4PenelopeRayleigh.hh"
-#include "G4PenelopeIonisation.hh"
-#include "G4PenelopeBremsstrahlung.hh"
-#include "G4PenelopeAnnihilation.hh"
+//cks 14.12.2011  // For Penelope processes:
+//cks 14.12.2011  #include "G4PenelopeCompton.hh"
+//cks 14.12.2011  #include "G4PenelopeGammaConversion.hh"
+//cks 14.12.2011  #include "G4PenelopePhotoElectric.hh"
+//cks 14.12.2011  #include "G4PenelopeRayleigh.hh"
+//cks 14.12.2011  #include "G4PenelopeIonisation.hh"
+//cks 14.12.2011  #include "G4PenelopeBremsstrahlung.hh"
+//cks 14.12.2011  #include "G4PenelopeAnnihilation.hh"
 
 // For Coulomb scattering instead of multiple scattering
 #include "G4CoulombScattering.hh"
-#include "G4CoulombScatteringModel.hh"
+//cks 14.12.2011  #include "G4CoulombScatteringModel.hh"
 
 // For Muonium formation in the Carbon foil
 #include "musrMuFormation.hh" // includes the yield function Y = Y(E).
@@ -270,7 +269,7 @@ void musrPhysicsList::ConstructProcess()
 #include "G4ProcessTable.hh"
 #include "G4WentzelVIModel.hh"
 #include "G4UrbanMscModel90.hh"
-#include "G4UrbanMscModel92.hh"
+//cks 14.12.2011  #include "G4UrbanMscModel92.hh"
 #include "G4UrbanMscModel93.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -322,14 +321,14 @@ void musrPhysicsList::ConstructEM()
 	  else if (stringProcessName=="G4ComptonScattering")        pManager->AddDiscreteProcess(new G4ComptonScattering);
 	  else if (stringProcessName=="G4GammaConversion")          pManager->AddDiscreteProcess(new G4GammaConversion);
 	  else if (stringProcessName=="G4RayleighScattering")       pManager->AddDiscreteProcess(new G4RayleighScattering);
-	  else if (stringProcessName=="G4PenelopePhotoElectric")    pManager->AddDiscreteProcess(new G4PenelopePhotoElectric);
-	  else if (stringProcessName=="G4PenelopeCompton")          pManager->AddDiscreteProcess(new G4PenelopeCompton);
-	  else if (stringProcessName=="G4PenelopeGammaConversion")  pManager->AddDiscreteProcess(new G4PenelopeGammaConversion);
-	  else if (stringProcessName=="G4PenelopeRayleigh")         pManager->AddDiscreteProcess(new G4PenelopeRayleigh);
-	  else if (stringProcessName=="G4LowEnergyPhotoElectric")   pManager->AddDiscreteProcess(new G4LowEnergyPhotoElectric);
-	  else if (stringProcessName=="G4LowEnergyCompton")         pManager->AddDiscreteProcess(new G4LowEnergyCompton);
-	  else if (stringProcessName=="G4LowEnergyGammaConversion") pManager->AddDiscreteProcess(new G4LowEnergyGammaConversion);
-	  else if (stringProcessName=="G4LowEnergyRayleigh")        pManager->AddDiscreteProcess(new G4LowEnergyRayleigh);
+//cks 14.12.2011  	  else if (stringProcessName=="G4PenelopePhotoElectric")    pManager->AddDiscreteProcess(new G4PenelopePhotoElectric);
+//cks 14.12.2011  	  else if (stringProcessName=="G4PenelopeCompton")          pManager->AddDiscreteProcess(new G4PenelopeCompton);
+//cks 14.12.2011  	  else if (stringProcessName=="G4PenelopeGammaConversion")  pManager->AddDiscreteProcess(new G4PenelopeGammaConversion);
+//cks 14.12.2011  	  else if (stringProcessName=="G4PenelopeRayleigh")         pManager->AddDiscreteProcess(new G4PenelopeRayleigh);
+//cks 14.12.2011  	  else if (stringProcessName=="G4LowEnergyPhotoElectric")   pManager->AddDiscreteProcess(new G4LowEnergyPhotoElectric);
+//cks 14.12.2011  	  else if (stringProcessName=="G4LowEnergyCompton")         pManager->AddDiscreteProcess(new G4LowEnergyCompton);
+//cks 14.12.2011  	  else if (stringProcessName=="G4LowEnergyGammaConversion") pManager->AddDiscreteProcess(new G4LowEnergyGammaConversion);
+//cks 14.12.2011  	  else if (stringProcessName=="G4LowEnergyRayleigh")        pManager->AddDiscreteProcess(new G4LowEnergyRayleigh);
 
 	  else if (stringProcessName=="G4CoulombScattering")        pManager->AddDiscreteProcess(new G4CoulombScattering);
 	  
@@ -353,11 +352,11 @@ void musrPhysicsList::ConstructEM()
 	  else if (stringProcessName=="G4eIonisation")                pManager->AddProcess(new G4eIonisation,nr1,nr2,nr3);
 	  else if (stringProcessName=="G4eBremsstrahlung")            pManager->AddProcess(new G4eBremsstrahlung,nr1,nr2,nr3);
 	  else if (stringProcessName=="G4eplusAnnihilation")          pManager->AddProcess(new G4eplusAnnihilation,nr1,nr2,nr3);
-	  else if (stringProcessName=="G4PenelopeIonisation")         pManager->AddProcess(new G4PenelopeIonisation,nr1,nr2,nr3);
-	  else if (stringProcessName=="G4PenelopeBremsstrahlung")     pManager->AddProcess(new G4PenelopeBremsstrahlung,nr1,nr2,nr3);
-	  else if (stringProcessName=="G4PenelopeAnnihilation")       pManager->AddProcess(new G4PenelopeAnnihilation,nr1,nr2,nr3);
-	  else if (stringProcessName=="G4LowEnergyIonisation")        pManager->AddProcess(new G4LowEnergyIonisation,nr1,nr2,nr3);
-	  else if (stringProcessName=="G4LowEnergyBremsstrahlung")    pManager->AddProcess(new G4LowEnergyBremsstrahlung,nr1,nr2,nr3);
+//cks 14.12.2011  	  else if (stringProcessName=="G4PenelopeIonisation")         pManager->AddProcess(new G4PenelopeIonisation,nr1,nr2,nr3);
+//cks 14.12.2011  	  else if (stringProcessName=="G4PenelopeBremsstrahlung")     pManager->AddProcess(new G4PenelopeBremsstrahlung,nr1,nr2,nr3);
+//cks 14.12.2011  	  else if (stringProcessName=="G4PenelopeAnnihilation")       pManager->AddProcess(new G4PenelopeAnnihilation,nr1,nr2,nr3);
+//cks 14.12.2011  	  else if (stringProcessName=="G4LowEnergyIonisation")        pManager->AddProcess(new G4LowEnergyIonisation,nr1,nr2,nr3);
+//cks 14.12.2011  	  else if (stringProcessName=="G4LowEnergyBremsstrahlung")    pManager->AddProcess(new G4LowEnergyBremsstrahlung,nr1,nr2,nr3);
 	  else if (stringProcessName=="G4MuMultipleScattering")       pManager->AddProcess(new G4MuMultipleScattering,nr1,nr2,nr3);
 	  else if (stringProcessName=="G4MuIonisation")               pManager->AddProcess(new G4MuIonisation,nr1,nr2,nr3);
 	  else if (stringProcessName=="G4MuBremsstrahlung")           pManager->AddProcess(new G4MuBremsstrahlung,nr1,nr2,nr3);
@@ -437,10 +436,10 @@ void musrPhysicsList::ConstructEM()
 	    G4MuMultipleScattering* mmm = (G4MuMultipleScattering*) processTable->FindProcess("muMsc",particleDefinition);
 	    mmm->AddEmModel(modelPriority, new G4UrbanMscModel90());
 	  }
-	  else if ((stringModelName=="G4UrbanMscModel92")&&(stringProcessName=="G4MuMultipleScattering")) {
-	    G4MuMultipleScattering* mmm = (G4MuMultipleScattering*) processTable->FindProcess("muMsc",particleDefinition);
-	    mmm->AddEmModel(modelPriority, new G4UrbanMscModel92());
-	  }
+//cks 14.12.2011  	  else if ((stringModelName=="G4UrbanMscModel92")&&(stringProcessName=="G4MuMultipleScattering")) {
+//cks 14.12.2011  	    G4MuMultipleScattering* mmm = (G4MuMultipleScattering*) processTable->FindProcess("muMsc",particleDefinition);
+//cks 14.12.2011  	    mmm->AddEmModel(modelPriority, new G4UrbanMscModel92());
+//cks 14.12.2011  	  }
 	  else if ((stringModelName=="G4UrbanMscModel93")&&(stringProcessName=="G4MuMultipleScattering")) {
 	    G4MuMultipleScattering* mmm = (G4MuMultipleScattering*) processTable->FindProcess("muMsc",particleDefinition);
 	    mmm->AddEmModel(modelPriority, new G4UrbanMscModel93());
@@ -546,7 +545,7 @@ void musrPhysicsList::ConstructEM()
       //	pmanager->AddProcess(new G4hIonisation,       -1, 2,2);
       //    }
       //    else {
-      pmanager->AddProcess(new G4hLowEnergyIonisation,       -1, 2,2);
+      pmanager->AddProcess(new G4hIonisation,       -1, 2,2);
       //    }
       ///pmanager->AddProcess(new G4UserSpecialCuts,  -1,-1,3);      
     }
diff --git a/src/musrPrimaryGeneratorAction.cc b/src/musrPrimaryGeneratorAction.cc
index e185452..8a9c5b5 100644
--- a/src/musrPrimaryGeneratorAction.cc
+++ b/src/musrPrimaryGeneratorAction.cc
@@ -285,7 +285,7 @@ void musrPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
   // with an angle of acos(hat{z} dot hat{n}) - dot product
   // i.e. R is a rotation around (-n_y, n_x, 0) with angle acos(n_z). 
 
-  if (xDirection == 0 & yDirection == 0) {
+  if ((xDirection == 0) && (yDirection == 0)) {
     // Rotation does not work for beam direction along z.
     pz = zDirection * pz;
     // No change to the beam spot...