LMU/musrsim
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: LMU:Geat4v10.7.2
Branches Tags
LMU:master LMU:Correct_Runnumber_for-_command_line_paths
LMU:Geant4v11.0.3 LMU:Geat4v10.7.2
...
compare: LMU:Geant4v11.0.3
Branches Tags
LMU:master LMU:Correct_Runnumber_for-_command_line_paths
LMU:Geant4v11.0.3 LMU:Geat4v10.7.2

1 Commits
Geat4v10.7 ... Geant4v11.

Author SHA1 Message Date
Zaher Salman
5757e0dbaa Minor changes to make musrSim comaptible with Geant4 v11.0.3 2022-11-03 14:19:01 +01:00
4 changed files with 7 additions and 7 deletions
Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -3,9 +3,9 @@
cmake_minimum_required(VERSION 2.6 FATAL_ERROR) cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
project(musrSim) project(musrSim)
#set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
#set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
#set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# KAMIL CHANGES: # KAMIL CHANGES:

2
src/F04ElementField.cc
View File

@ -158,7 +158,7 @@ G4VisAttributes* F04ElementField::getVisAttribute(G4String color)
} }
} }
if (!p) p = new G4VisAttributes(G4VisAttributes::Invisible); if (!p) p = new G4VisAttributes(G4VisAttributes::GetInvisible());
p->SetDaughtersInvisible(false); p->SetDaughtersInvisible(false);
return p; return p;

2
src/musrDetectorConstruction.cc
View File

@ -1977,7 +1977,7 @@ void musrDetectorConstruction::SetColourOfLogicalVolume(G4LogicalVolume* pLogVol
else if (strcmp(colour,"gray" )==0) {pLogVol->SetVisAttributes(G4Colour(0.5,0.5,0.5));} else if (strcmp(colour,"gray" )==0) {pLogVol->SetVisAttributes(G4Colour(0.5,0.5,0.5));}
else if (strcmp(colour,"cyan" )==0) {pLogVol->SetVisAttributes(G4Colour(0,1,1));} else if (strcmp(colour,"cyan" )==0) {pLogVol->SetVisAttributes(G4Colour(0,1,1));}
else if (strcmp(colour,"magenta")==0) {pLogVol->SetVisAttributes(G4Colour(1,0,1));} else if (strcmp(colour,"magenta")==0) {pLogVol->SetVisAttributes(G4Colour(1,0,1));}
else if (strcmp(colour,"invisible" )==0) {pLogVol->SetVisAttributes(G4VisAttributes::Invisible);} else if (strcmp(colour,"invisible" )==0) {pLogVol->SetVisAttributes(G4VisAttributes::GetInvisible());}
else if (strcmp(colour,"blue_style")==0) {pLogVol->SetVisAttributes(G4Colour(0.80,0.83,1));} else if (strcmp(colour,"blue_style")==0) {pLogVol->SetVisAttributes(G4Colour(0.80,0.83,1));}
// else if (strcmp(colour,"lightblue")==0) {pLogVol->SetVisAttributes(G4Colour(0,0.5,1));} // else if (strcmp(colour,"lightblue")==0) {pLogVol->SetVisAttributes(G4Colour(0,0.5,1));}

4
src/musrSteppingAction.cc
View File

@ -160,7 +160,7 @@ void musrSteppingAction::UserSteppingAction(const G4Step* aStep) {
// There is an example how to delete the track in example/novice/N04. // There is an example how to delete the track in example/novice/N04.
// It is done in a different way here, because the example/novice/N04 was not doing // It is done in a different way here, because the example/novice/N04 was not doing
// exactly what I wanted. // exactly what I wanted.
if((actualVolume(0,8)=="log_kill")||(actualVolume(0,8)=="log_Kill")) { if((actualVolume.substr(0,8)=="log_kill")||(actualVolume.substr(0,8)=="log_Kill")) {
aTrack->SetTrackStatus(fStopAndKill); // suspend the track aTrack->SetTrackStatus(fStopAndKill); // suspend the track
} }
if ((p_name=="nu_mu")||(p_name=="anti_nu_mu")||(p_name=="nu_e")||(p_name=="anti_nu_e")) { if ((p_name=="nu_mu")||(p_name=="anti_nu_mu")||(p_name=="nu_e")||(p_name=="anti_nu_e")) {
@ -390,7 +390,7 @@ void musrSteppingAction::UserSteppingAction(const G4Step* aStep) {
// There is an example how to delete the track in example/novice/N04. // There is an example how to delete the track in example/novice/N04.
// It is done in a different way here, because the example/novice/N04 was not doing // It is done in a different way here, because the example/novice/N04 was not doing
// exactly what I wanted. // exactly what I wanted.
if((actualVolume(0,10)=="log_shield")||(actualVolume(0,10)=="log_Shield")) { if((actualVolume.substr(0,10)=="log_shield")||(actualVolume.substr(0,10)=="log_Shield")) {
aTrack->SetTrackStatus(fStopAndKill); // suspend the track aTrack->SetTrackStatus(fStopAndKill); // suspend the track
} }
} }