Commit 81dbde52 authored by John Derek Chapman's avatar John Derek Chapman Committed by Graeme Stewart
Browse files

src/DetectorGeometryBase.cxx (SetRotationAndOffset): ensure that additional...

src/DetectorGeometryBase.cxx (SetRotationAndOffset): ensure that additional translations are added to any existing ones rather than overwriting them. ATLASSIM-3001. Tagging: G4AtlasTools-00-02-12-02 (G4AtlasTools-00-02-12-02)

	* src/DetectorGeometryBase.cxx (SetRotationAndOffset): ensure that
	additional translations are added to any existing ones rather than
	overwriting them. ATLASSIM-3001.
	* Tagging: G4AtlasTools-00-02-12-02

2016-07-22  John Chapman  <John.Chapman@cern.ch>

	* Branch for Muon Envelope updates in 20.7.X, 20.20.X, 21.0.X and
	22.0.0.
	* python/G4GeometryConfig.py - update MUONQ02 envelope to support
	MuonSpectrometer-R.07.03. ATLASSIM-2665
	* python/G4AtlasToolsConfig.py (generateCaloSensitiveDetectorList):
	add hook for HGTDSensorSD. ATLASSIM-2992.
	* Tagging: G4AtlasTools-00-02-12-01

2016-05-31  Zach Marshall <ZLMarshall@lbl.gov>

	* src/G4AtlasDetectorConstructionTool.cxx: Member variable named with m_
	and fixing Coverity defect 108587
...
(Long ChangeLog diff - truncated)
parent ae8aa4bd
......@@ -46,7 +46,7 @@ class G4AtlasDetectorConstructionTool final : public AthAlgTool, virtual public
protected:
G4VPhysicalVolume* world;
G4VPhysicalVolume* m_world;
};
......
......@@ -96,6 +96,8 @@ def generateCaloSensitiveDetectorList():
if DetFlags.simulate.LAr_on():
SensitiveDetectorList += [ 'LArEMBSensitiveDetector','LArEMECSensitiveDetector','LArFCALSensitiveDetector',\
'LArHECSensitiveDetector','LArMiniFCALSensitiveDetector']
if hasattr(DetFlags.simulate, 'HGTD_on') and DetFlags.simulate.HGTD_on():
SensitiveDetectorList += [ 'HGTDSensorSD' ]
SensitiveDetectorList += [ 'MinBiasScintillatorSD' ]
from G4AtlasApps.SimFlags import simFlags
if simFlags.CalibrationRun.get_Value() in ['LAr', 'LAr+Tile']:
......
......@@ -124,10 +124,10 @@ def getForwardRegionEnvelope(name='ForwardRegion', **kwargs):
def getMUONEnvelope(name="MUONQ02", **kwargs): #FIXME rename to MUON when safe
kwargs.setdefault("DetectorName", "MUONQ02") #FIXME rename to MUON when safe
kwargs.setdefault("NSurfaces", 30)
kwargs.setdefault("InnerRadii", [1050.,1050.,1050.,1050.,436.7,436.7,279.,279.,70.,70.,420.,420.,3800.,3800.,4255.,4255.,3800.,3800.,420.,420.,70.,70.,279.,279.,436.7,436.7,1050.,1050.,1050.,1050.]) #FIXME Units?
kwargs.setdefault("OuterRadii", [1500.,1500.,2750.,2750.,12650.,12650.,13400.,13400.,13910.,13910.,13910.,13910.,13910.,13910.,13000.,13000.,13910.,13910.,13910.,13910.,13910.,13910.,13400.,13400.,12650.,12650.,2750.,2750.,1500.,1500.]) #FIXME Units?
kwargs.setdefault("ZSurfaces", [-26046.,-23001.,-23001.,-22030.,-22030.,-18650.,-18650.,-12900.,-12900.,-6783.,-6783.,-6736.,-6736.,-6550.,-6550.,6550.,6550.,6736.,6736.,6783.,6783.,12900.,12900.,18650.,18650.,22030.,22030.,23001.,23001.,26046.]) #FIXME Units?
kwargs.setdefault("NSurfaces", 34)
kwargs.setdefault("InnerRadii", [1050.,1050.,1050.,1050.,436.7,436.7,279.,279.,70.,70.,420.,420.,3800.,3800.,4255.,4255.,4255.,4255.,4255.,4255.,3800.,3800.,420.,420.,70.,70.,279.,279.,436.7,436.7,1050.,1050.,1050.,1050.]) #FIXME Units?
kwargs.setdefault("OuterRadii", [1500.,1500.,2750.,2750.,12650.,12650.,13400.,13400.,14200.,14200.,14200.,14200.,14200.,14200.,14200.,14200.,13000.,13000.,14200.,14200.,14200.,14200.,14200.,14200.,14200.,14200.,13400.,13400.,12650.,12650.,2750.,2750.,1500.,1500.]) #FIXME Units?
kwargs.setdefault("ZSurfaces", [-26046.,-23001.,-23001.,-22030.,-22030.,-18650.,-18650.,-12900.,-12900.,-6783.,-6783.,-6736.,-6736.,-6550.,-6550.,-4000.,-4000.,4000.,4000.,6550.,6550.,6736.,6736.,6783.,6783.,12900.,12900.,18650.,18650.,22030.,22030.,23001.,23001.,26046.]) #FIXME Units?
SubDetectorList=[]
from AthenaCommon.DetFlags import DetFlags
if DetFlags.geometry.Muon_on():
......@@ -187,8 +187,8 @@ def getATLAS(name="Atlas", **kwargs):
## OuterRadii
AtlasForwardOuterR = 2751.
AtlasOuterR1 = 13911.
AtlasOuterR2 = 13911.
AtlasOuterR1 = 14201.
AtlasOuterR2 = 14201.
AtlasOuterR3 = 1501.
if jobproperties.Beam.beamType() != 'cosmics' and not DetFlags.Muon_on() and not \
(simFlags.CavernBG.statusOn and not 'Signal' in simFlags.CavernBG.get_Value() ):
......
......@@ -109,7 +109,7 @@ void DetectorGeometryBase::SetRotationAndOffset()
m_envelope.theRotation->rotateZ(m_rotateZ);
}
//Then offset the position
m_envelope.thePosition=G4ThreeVector(m_offsetX,m_offsetY,m_offsetZ);
m_envelope.thePosition+=G4ThreeVector(m_offsetX,m_offsetY,m_offsetZ);
if (m_envelope.thePositionedVolume) m_envelope.thePositionedVolume->SetTranslation(m_envelope.thePosition);
ATH_MSG_VERBOSE( name() << "::SetRotationAndOffset() (Base class method): Finished" );
......
......@@ -25,6 +25,7 @@
G4AtlasDetectorConstructionTool::G4AtlasDetectorConstructionTool( const std::string& type,
const std::string& nam,const IInterface* parent )
: AthAlgTool( type, nam , parent )
, m_world(nullptr)
{
ATH_MSG_INFO("G4AtlasDetectorConstructionTool "<<type<<" "<<nam);
declareInterface< IDetectorConstructionTool >( this ) ;
......@@ -49,11 +50,11 @@ StatusCode G4AtlasDetectorConstructionTool::initialize( )
void G4AtlasDetectorConstructionTool::SetWorld(G4VPhysicalVolume *w)
{
world=w;
m_world=w;
}
G4VPhysicalVolume* G4AtlasDetectorConstructionTool::Construct()
{
return world;
return m_world;
}
StatusCode G4AtlasDetectorConstructionTool::queryInterface(const InterfaceID& riid, void** ppvIf) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment