Import Geant4 11.3.0 source tree
This commit is contained in:
@@ -226,109 +226,6 @@ class G4TwistedTubs : public G4VSolid
|
||||
mutable G4bool fRebuildPolyhedron = false;
|
||||
mutable G4Polyhedron* fpPolyhedron = nullptr; // polyhedron for vis
|
||||
|
||||
class LastState // last Inside result
|
||||
{
|
||||
public:
|
||||
LastState()
|
||||
{
|
||||
p.set(kInfinity,kInfinity,kInfinity);
|
||||
inside = kOutside;
|
||||
}
|
||||
~LastState()= default;
|
||||
LastState(const LastState& r) = default;
|
||||
LastState& operator=(const LastState& r)
|
||||
{
|
||||
if (this == &r) { return *this; }
|
||||
p = r.p; inside = r.inside;
|
||||
return *this;
|
||||
}
|
||||
public:
|
||||
G4ThreeVector p;
|
||||
EInside inside;
|
||||
};
|
||||
|
||||
class LastVector // last SurfaceNormal result
|
||||
{
|
||||
public:
|
||||
LastVector()
|
||||
{
|
||||
p.set(kInfinity,kInfinity,kInfinity);
|
||||
vec.set(kInfinity,kInfinity,kInfinity);
|
||||
surface = new G4VTwistSurface*[1];
|
||||
}
|
||||
~LastVector()
|
||||
{
|
||||
delete [] surface;
|
||||
}
|
||||
LastVector(const LastVector& r) : p(r.p), vec(r.vec)
|
||||
{
|
||||
surface = new G4VTwistSurface*[1];
|
||||
surface[0] = r.surface[0];
|
||||
}
|
||||
LastVector& operator=(const LastVector& r)
|
||||
{
|
||||
if (&r == this) { return *this; }
|
||||
p = r.p; vec = r.vec;
|
||||
delete [] surface; surface = new G4VTwistSurface*[1];
|
||||
surface[0] = r.surface[0];
|
||||
return *this;
|
||||
}
|
||||
public:
|
||||
G4ThreeVector p;
|
||||
G4ThreeVector vec;
|
||||
G4VTwistSurface **surface;
|
||||
};
|
||||
|
||||
class LastValue // last G4double value
|
||||
{
|
||||
public:
|
||||
LastValue()
|
||||
{
|
||||
p.set(kInfinity,kInfinity,kInfinity);
|
||||
value = DBL_MAX;
|
||||
}
|
||||
~LastValue()= default;
|
||||
LastValue(const LastValue& r) = default;
|
||||
LastValue& operator=(const LastValue& r)
|
||||
{
|
||||
if (this == &r) { return *this; }
|
||||
p = r.p; value = r.value;
|
||||
return *this;
|
||||
}
|
||||
public:
|
||||
G4ThreeVector p;
|
||||
G4double value;
|
||||
};
|
||||
|
||||
class LastValueWithDoubleVector // last G4double value
|
||||
{
|
||||
public:
|
||||
LastValueWithDoubleVector()
|
||||
{
|
||||
p.set(kInfinity,kInfinity,kInfinity);
|
||||
vec.set(kInfinity,kInfinity,kInfinity);
|
||||
value = DBL_MAX;
|
||||
}
|
||||
~LastValueWithDoubleVector()= default;
|
||||
LastValueWithDoubleVector(const LastValueWithDoubleVector& r) = default;
|
||||
LastValueWithDoubleVector& operator=(const LastValueWithDoubleVector& r)
|
||||
{
|
||||
if (this == &r) { return *this; }
|
||||
p = r.p; vec = r.vec; value = r.value;
|
||||
return *this;
|
||||
}
|
||||
public:
|
||||
G4ThreeVector p;
|
||||
G4ThreeVector vec;
|
||||
G4double value;
|
||||
};
|
||||
|
||||
LastState fLastInside;
|
||||
LastVector fLastNormal;
|
||||
LastValue fLastDistanceToIn;
|
||||
LastValue fLastDistanceToOut;
|
||||
LastValueWithDoubleVector fLastDistanceToInWithV;
|
||||
LastValueWithDoubleVector fLastDistanceToOutWithV;
|
||||
};
|
||||
|
||||
//=====================================================================
|
||||
|
||||
@@ -190,110 +190,6 @@ class G4VTwistedFaceted: public G4VSolid
|
||||
G4VTwistSurface* fSide180 ; // Twisted Side at phi = 180 deg
|
||||
G4VTwistSurface* fSide270 ; // Twisted Side at phi = 270 deg
|
||||
|
||||
private:
|
||||
|
||||
class LastState // last Inside result
|
||||
{
|
||||
public:
|
||||
LastState()
|
||||
{
|
||||
p.set(kInfinity,kInfinity,kInfinity); inside = kOutside;
|
||||
}
|
||||
~LastState()= default;
|
||||
LastState(const LastState& r) = default;
|
||||
LastState& operator=(const LastState& r)
|
||||
{
|
||||
if (this == &r) { return *this; }
|
||||
p = r.p; inside = r.inside;
|
||||
return *this;
|
||||
}
|
||||
public:
|
||||
G4ThreeVector p;
|
||||
EInside inside;
|
||||
};
|
||||
|
||||
class LastVector // last SurfaceNormal result
|
||||
{
|
||||
public:
|
||||
LastVector()
|
||||
{
|
||||
p.set(kInfinity,kInfinity,kInfinity);
|
||||
vec.set(kInfinity,kInfinity,kInfinity);
|
||||
surface = new G4VTwistSurface*[1];
|
||||
}
|
||||
~LastVector()
|
||||
{
|
||||
delete [] surface;
|
||||
}
|
||||
LastVector(const LastVector& r) : p(r.p), vec(r.vec)
|
||||
{
|
||||
surface = new G4VTwistSurface*[1];
|
||||
surface[0] = r.surface[0];
|
||||
}
|
||||
LastVector& operator=(const LastVector& r)
|
||||
{
|
||||
if (&r == this) { return *this; }
|
||||
p = r.p; vec = r.vec;
|
||||
delete [] surface; surface = new G4VTwistSurface*[1];
|
||||
surface[0] = r.surface[0];
|
||||
return *this;
|
||||
}
|
||||
public:
|
||||
G4ThreeVector p;
|
||||
G4ThreeVector vec;
|
||||
G4VTwistSurface **surface;
|
||||
};
|
||||
|
||||
class LastValue // last G4double value
|
||||
{
|
||||
public:
|
||||
LastValue()
|
||||
{
|
||||
p.set(kInfinity,kInfinity,kInfinity);
|
||||
value = DBL_MAX;
|
||||
}
|
||||
~LastValue()= default;
|
||||
LastValue(const LastValue& r) = default;
|
||||
LastValue& operator=(const LastValue& r)
|
||||
{
|
||||
if (this == &r) { return *this; }
|
||||
p = r.p; value = r.value;
|
||||
return *this;
|
||||
}
|
||||
public:
|
||||
G4ThreeVector p;
|
||||
G4double value;
|
||||
};
|
||||
|
||||
class LastValueWithDoubleVector // last G4double value
|
||||
{
|
||||
public:
|
||||
LastValueWithDoubleVector()
|
||||
{
|
||||
p.set(kInfinity,kInfinity,kInfinity);
|
||||
vec.set(kInfinity,kInfinity,kInfinity);
|
||||
value = DBL_MAX;
|
||||
}
|
||||
~LastValueWithDoubleVector()= default;
|
||||
LastValueWithDoubleVector(const LastValueWithDoubleVector& r) = default;
|
||||
LastValueWithDoubleVector& operator=(const LastValueWithDoubleVector& r)
|
||||
{
|
||||
if (this == &r) { return *this; }
|
||||
p = r.p; vec = r.vec; value = r.value;
|
||||
return *this;
|
||||
}
|
||||
public:
|
||||
G4ThreeVector p;
|
||||
G4ThreeVector vec;
|
||||
G4double value;
|
||||
};
|
||||
|
||||
LastState fLastInside;
|
||||
LastVector fLastNormal;
|
||||
LastValue fLastDistanceToIn;
|
||||
LastValue fLastDistanceToOut;
|
||||
LastValueWithDoubleVector fLastDistanceToInWithV;
|
||||
LastValueWithDoubleVector fLastDistanceToOutWithV;
|
||||
};
|
||||
|
||||
//=====================================================================
|
||||
|
||||
Reference in New Issue
Block a user