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

Continued changes for geant4.10, still not yet finished

Browse Source
This commit is contained in:
nemu
2014-08-14 17:31:31 +02:00
parent 040457f56e
commit b5072a3e20
15 changed files with 266 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/F04ElementField.cc
View File

@ -52,12 +52,12 @@ F04ElementField::F04ElementField(G4ThreeVector c, G4LogicalVolume* lv)
lvolume = lv;
lvolume->SetVisAttributes(getVisAttribute(color));
maxStep = 1*mm;
maxStep = 1*CLHEP::mm;
userLimits->SetMaxAllowedStep(maxStep);
userLimits->SetUserMaxTrackLength(500.*m);
userLimits->SetUserMaxTime(10*ms);
userLimits->SetUserMaxTrackLength(500.*CLHEP::m);
userLimits->SetUserMaxTime(10*CLHEP::ms);
// userLimits->SetUserMinEkine(0.1*MeV);
// userLimits->SetUserMinRange(1*mm);
@ -83,7 +83,7 @@ void F04ElementField::construct()
geomManager->CloseGeometry(true);
}
G4cout<<"F04ElementField: center="<<center.x()/mm<<", "<<center.y()/mm<<", "<<center.z()/mm<<" mm"<<G4endl;
G4cout<<"F04ElementField: center="<<center.x()/CLHEP::mm<<", "<<center.y()/CLHEP::mm<<", "<<center.z()/CLHEP::mm<<" mm"<<G4endl;
aNavigator->LocateGlobalPointAndSetup(center,0,false);
G4TouchableHistoryHandle fTouchable = aNavigator->
@ -111,7 +111,7 @@ void F04ElementField::construct()
// Print out the point of the origin of the field in the local coordinate system of the logical volume:
G4ThreeVector local_center = global2local.TransformPoint(center);
G4cout<<"\t==> "<<elementFieldName<<" in vol.=\""<<volumeName<<"\", center(local coord. system): "
<<local_center.x()/mm<<", "<<local_center.y()/mm<<", "<<local_center.z()/mm<<" mm."<<G4endl;
<<local_center.x()/CLHEP::mm<<", "<<local_center.y()/CLHEP::mm<<", "<<local_center.z()/CLHEP::mm<<" mm."<<G4endl;
// Now move the centre of the transformation such that it coincides with the point "center":
global2local*=G4AffineTransform(-local_center);
@ -179,7 +179,7 @@ void F04ElementField::SetEventNrDependentField(G4double initialField, G4double f
G4cout << "Setting field in steps for field "<<elementFieldName<<G4endl;
std::map<G4int,G4double>::iterator it;
for ( it=changeFieldInStepsMap.begin() ; it != changeFieldInStepsMap.end(); it++ ) {
G4cout << "Field will be changed at event "<< (*it).first << " to the value of " << (*it).second/tesla<<" T" << G4endl;
G4cout << "Field will be changed at event "<< (*it).first << " to the value of " << (*it).second/CLHEP::tesla<<" T" << G4endl;
// G4double nominalFieldValue=it->second;
// it->SetNominalFieldValue(nominalFieldValue);
}