lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-12-06 15:12:28 +01:00
parent b2a62ae692
commit 5baee230e9
2997 changed files with 141580 additions and 98673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/advanced/purging_magnet/src/PurgMagDetectorConstruction.cc
+2 -2
View File
@@ -204,7 +204,7 @@ void PurgMagDetectorConstruction::DefineMaterials()
GapMaterial = Fe;
G4cout << "end material"<< endl;
G4cout << "end material"<< G4endl;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -432,7 +432,7 @@ void PurgMagDetectorConstruction::ConstructSDandField()
G4FieldManager* pFieldMgr =
G4TransportationManager::GetTransportationManager()->GetFieldManager();
G4cout<< "DeltaStep "<<pFieldMgr->GetDeltaOneStep()/mm <<"mm" <<endl;
G4cout<< "DeltaStep "<<pFieldMgr->GetDeltaOneStep()/mm <<"mm" <<G4endl;
//G4ChordFinder *pChordFinder = new G4ChordFinder(PurgMagField);
pFieldMgr->SetDetectorField(fField.Get());
examples/advanced/purging_magnet/src/PurgMagTabulatedField3D.cc
+11 -9
View File
@@ -42,6 +42,8 @@ namespace{
G4Mutex myPurgMagTabulatedField3DLock = G4MUTEX_INITIALIZER;
}
using namespace std;
PurgMagTabulatedField3D::PurgMagTabulatedField3D(const char* filename,
double zOffset )
:fZoffset(zOffset),invertX(false),invertY(false),invertZ(false)
@@ -53,7 +55,7 @@ PurgMagTabulatedField3D::PurgMagTabulatedField3D(const char* filename,
<< "\n Magnetic field"
<< "\n-----------------------------------------------------------";
G4cout << "\n ---> " "Reading the field grid from " << filename << " ... " << endl;
G4cout << "\n ---> " "Reading the field grid from " << filename << " ... " << G4endl;
//
//This is a thread-local class and we have to avoid that all workers open the
@@ -65,7 +67,7 @@ PurgMagTabulatedField3D::PurgMagTabulatedField3D(const char* filename,
if (!file.is_open())
{
G4ExceptionDescription ed;
ed << "Could not open input file " << filename << G4endl;
ed << "Could not open input file " << filename << std::endl;
G4Exception("PurgMagTabulatedField3D::PurgMagTabulatedField3D",
"pugmag001",FatalException,ed);
}
@@ -79,7 +81,7 @@ PurgMagTabulatedField3D::PurgMagTabulatedField3D(const char* filename,
G4cout << " [ Number of values x,y,z: "
<< nx << " " << ny << " " << nz << " ] "
<< endl;
<< G4endl;
// Set up storage space for table
xField.resize( nx );
@@ -130,15 +132,15 @@ PurgMagTabulatedField3D::PurgMagTabulatedField3D(const char* filename,
maxy = yval * lenUnit;
maxz = zval * lenUnit;
G4cout << "\n ---> ... done reading " << endl;
G4cout << "\n ---> ... done reading " << G4endl;
// G4cout << " Read values of field from file " << filename << endl;
// G4cout << " Read values of field from file " << filename << G4endl;
G4cout << " ---> assumed the order: x, y, z, Bx, By, Bz "
<< "\n ---> Min values x,y,z: "
<< minx/cm << " " << miny/cm << " " << minz/cm << " cm "
<< "\n ---> Max values x,y,z: "
<< maxx/cm << " " << maxy/cm << " " << maxz/cm << " cm "
<< "\n ---> The field will be offset by " << zOffset/cm << " cm " << endl;
<< "\n ---> The field will be offset by " << zOffset/cm << " cm " << G4endl;
// Should really check that the limits are not the wrong way around.
if (maxx < minx) {swap(maxx,minx); invertX = true;}
@@ -155,7 +157,7 @@ PurgMagTabulatedField3D::PurgMagTabulatedField3D(const char* filename,
dz = maxz - minz;
G4cout << "\n ---> Dif values x,y,z (range): "
<< dx/cm << " " << dy/cm << " " << dz/cm << " cm in z "
<< "\n-----------------------------------------------------------" << endl;
<< "\n-----------------------------------------------------------" << G4endl;
}
void PurgMagTabulatedField3D::GetFieldValue(const double point[4],
@@ -199,8 +201,8 @@ void PurgMagTabulatedField3D::GetFieldValue(const double point[4],
#ifdef DEBUG_INTERPOLATING_FIELD
G4cout << "Local x,y,z: " << xlocal << " " << ylocal << " " << zlocal << endl;
G4cout << "Index x,y,z: " << xindex << " " << yindex << " " << zindex << endl;
G4cout << "Local x,y,z: " << xlocal << " " << ylocal << " " << zlocal << G4endl;
G4cout << "Index x,y,z: " << xindex << " " << yindex << " " << zindex << G4endl;
double valx0z0, mulx0z0, valx1z0, mulx1z0;
double valx0z1, mulx0z1, valx1z1, mulx1z1;
valx0z0= table[xindex ][0][zindex]; mulx0z0= (1-xlocal) * (1-zlocal);