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

Import Geant4 10.4.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-06-30 10:49:55 +02:00
parent 3a5407696b
commit 1a1316fea4
2180 changed files with 237880 additions and 59109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/modeling/src/G4MagneticFieldModel.cc
+10 -13
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4MagneticFieldModel.cc 94206 2015-11-09 08:11:59Z gcosmo $
// $Id: G4MagneticFieldModel.cc 101958 2016-12-12 08:04:35Z gcosmo $
//
//
// John Allison 17th August 2013
@@ -51,15 +51,18 @@ G4MagneticFieldModel::~G4MagneticFieldModel () {}
G4MagneticFieldModel::G4MagneticFieldModel
(G4int nDataPointsPerMaxHalfScene,
Representation representation)
Representation representation,
G4int arrow3DLineSegmentsPerCircle)
: fNDataPointsPerMaxHalfScene(nDataPointsPerMaxHalfScene)
, fRepresentation(representation)
, fArrow3DLineSegmentsPerCircle(arrow3DLineSegmentsPerCircle)
{
fType = "G4MagneticFieldModel";
fGlobalTag = fType;
std::ostringstream oss;
oss << fNDataPointsPerMaxHalfScene;
fGlobalDescription = fType + ':' + oss.str();
oss << ':' << fNDataPointsPerMaxHalfScene
<< ':' << fArrow3DLineSegmentsPerCircle;
fGlobalDescription = fType + oss.str();
}
void G4MagneticFieldModel::DescribeYourselfTo (G4VGraphicsScene& sceneHandler)
@@ -109,14 +112,6 @@ void G4MagneticFieldModel::DescribeYourselfTo (G4VGraphicsScene& sceneHandler)
warned = true;
}
}
} else {
static G4bool warned = false;
if (!warned) {
G4cout << intro
<< "No global field exists."
<< G4endl;
warned = true;
}
}
} else {
static G4bool warned = false;
@@ -270,7 +265,9 @@ void G4MagneticFieldModel::DescribeYourselfTo (G4VGraphicsScene& sceneHandler)
const G4double y2 = y1 + arrowLength * By / B;
const G4double z2 = z1 + arrowLength * Bz / B;
if (fRepresentation == Representation::fullArrow) {
G4ArrowModel BArrow(x1,y1,z1,x2,y2,z2,arrowLength/5,arrowColour);
G4ArrowModel BArrow(x1,y1,z1,x2,y2,z2,arrowLength/5,arrowColour,
"BField",
fArrow3DLineSegmentsPerCircle);
BArrow.DescribeYourselfTo(sceneHandler);
} else if (fRepresentation == Representation::lightArrow) {
G4Polyline BArrowLite;