Import Geant4 10.4.0 source tree
This commit is contained in:
@@ -78,9 +78,9 @@ namespace CexmcAST
|
||||
|
||||
struct Operator
|
||||
{
|
||||
Operator( OperatorType type = Uninitialized, int priority = 0,
|
||||
bool hasRLAssoc = false ) :
|
||||
type( type ), priority( priority ), hasRLAssoc( hasRLAssoc )
|
||||
Operator( OperatorType type_ = Uninitialized, int priority_ = 0,
|
||||
bool hasRLAssoc_ = false ) :
|
||||
type( type_ ), priority( priority_ ), hasRLAssoc( hasRLAssoc_ )
|
||||
{}
|
||||
|
||||
OperatorType type;
|
||||
|
||||
@@ -54,8 +54,8 @@ struct CexmcAngularRange
|
||||
CexmcAngularRange()
|
||||
{}
|
||||
|
||||
CexmcAngularRange( G4double top, G4double bottom, G4int index ) :
|
||||
top( top ), bottom( bottom ), index( index )
|
||||
CexmcAngularRange( G4double top_, G4double bottom_, G4int index_ ) :
|
||||
top( top_ ), bottom( bottom_ ), index( index_ )
|
||||
{}
|
||||
|
||||
G4double top;
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
#include "CexmcCommon.hh"
|
||||
|
||||
class CexmcChargeExchangeReconstructorMessenger;
|
||||
class CexmcEnergyDepositStore;
|
||||
struct CexmcEnergyDepositStore;
|
||||
class CexmcProductionModel;
|
||||
class CexmcParticleGun;
|
||||
|
||||
|
||||
@@ -61,6 +61,7 @@ namespace CexmcCustomFilter
|
||||
using namespace boost::spirit::ascii;
|
||||
using namespace boost::phoenix;
|
||||
using namespace CexmcAST;
|
||||
using boost::spirit::qi::rule;
|
||||
using boost::spirit::ascii::space;
|
||||
using boost::spirit::ascii::space_type;
|
||||
using boost::spirit::ascii::alpha;
|
||||
|
||||
@@ -51,29 +51,29 @@
|
||||
|
||||
struct CexmcEnergyDepositStore
|
||||
{
|
||||
CexmcEnergyDepositStore( G4double monitorED,
|
||||
G4double vetoCounterEDLeft,
|
||||
G4double vetoCounterEDRight,
|
||||
G4double calorimeterEDLeft,
|
||||
G4double calorimeterEDRight,
|
||||
G4int calorimeterEDLeftMaxX,
|
||||
G4int calorimeterEDLeftMaxY,
|
||||
G4int calorimeterEDRightMaxX,
|
||||
G4int calorimeterEDRightMaxY,
|
||||
CexmcEnergyDepositStore( G4double monitorED_,
|
||||
G4double vetoCounterEDLeft_,
|
||||
G4double vetoCounterEDRight_,
|
||||
G4double calorimeterEDLeft_,
|
||||
G4double calorimeterEDRight_,
|
||||
G4int calorimeterEDLeftMaxX_,
|
||||
G4int calorimeterEDLeftMaxY_,
|
||||
G4int calorimeterEDRightMaxX_,
|
||||
G4int calorimeterEDRightMaxY_,
|
||||
const CexmcEnergyDepositCalorimeterCollection &
|
||||
calorimeterEDLeftCollection,
|
||||
calorimeterEDLeftCollection_,
|
||||
const CexmcEnergyDepositCalorimeterCollection &
|
||||
calorimeterEDRightCollection ) :
|
||||
monitorED( monitorED ), vetoCounterEDLeft( vetoCounterEDLeft ),
|
||||
vetoCounterEDRight( vetoCounterEDRight ),
|
||||
calorimeterEDLeft( calorimeterEDLeft ),
|
||||
calorimeterEDRight( calorimeterEDRight ),
|
||||
calorimeterEDLeftMaxX( calorimeterEDLeftMaxX ),
|
||||
calorimeterEDLeftMaxY( calorimeterEDLeftMaxY ),
|
||||
calorimeterEDRightMaxX( calorimeterEDRightMaxX ),
|
||||
calorimeterEDRightMaxY( calorimeterEDRightMaxY ),
|
||||
calorimeterEDLeftCollection( calorimeterEDLeftCollection ),
|
||||
calorimeterEDRightCollection( calorimeterEDRightCollection )
|
||||
calorimeterEDRightCollection_ ) :
|
||||
monitorED( monitorED_ ), vetoCounterEDLeft( vetoCounterEDLeft_ ),
|
||||
vetoCounterEDRight( vetoCounterEDRight_ ),
|
||||
calorimeterEDLeft( calorimeterEDLeft_ ),
|
||||
calorimeterEDRight( calorimeterEDRight_ ),
|
||||
calorimeterEDLeftMaxX( calorimeterEDLeftMaxX_ ),
|
||||
calorimeterEDLeftMaxY( calorimeterEDLeftMaxY_ ),
|
||||
calorimeterEDRightMaxX( calorimeterEDRightMaxX_ ),
|
||||
calorimeterEDRightMaxY( calorimeterEDRightMaxY_ ),
|
||||
calorimeterEDLeftCollection( calorimeterEDLeftCollection_ ),
|
||||
calorimeterEDRightCollection( calorimeterEDRightCollection_ )
|
||||
{}
|
||||
|
||||
void * operator new( size_t size );
|
||||
|
||||
@@ -50,11 +50,11 @@
|
||||
class G4Event;
|
||||
class CexmcPhysicsManager;
|
||||
class CexmcEnergyDepositDigitizer;
|
||||
class CexmcEnergyDepositStore;
|
||||
struct CexmcEnergyDepositStore;
|
||||
class CexmcTrackPointsDigitizer;
|
||||
class CexmcTrackPointsStore;
|
||||
struct CexmcTrackPointsStore;
|
||||
class CexmcEventActionMessenger;
|
||||
class CexmcProductionModelData;
|
||||
struct CexmcProductionModelData;
|
||||
class CexmcChargeExchangeReconstructor;
|
||||
|
||||
|
||||
@@ -150,7 +150,9 @@ class CexmcEventAction : public G4UserEventAction
|
||||
|
||||
CexmcChargeExchangeReconstructor * reconstructor;
|
||||
|
||||
G4double opKinEnergy;
|
||||
#ifdef CEXMC_USE_ROOT
|
||||
G4double opKinEnergy;
|
||||
#endif
|
||||
|
||||
private:
|
||||
G4int verbose;
|
||||
|
||||
@@ -63,8 +63,8 @@ class CexmcHadronicPhysics : public CexmcStudiedPhysics< CexmcHadronicProcess >
|
||||
|
||||
template < typename ProductionModel >
|
||||
CexmcHadronicPhysics< ProductionModel >::CexmcHadronicPhysics(
|
||||
CexmcPhysicsManager * physicsManager ) :
|
||||
CexmcStudiedPhysics< CexmcHadronicProcess >( physicsManager )
|
||||
CexmcPhysicsManager * physicsManager_ ) :
|
||||
CexmcStudiedPhysics< CexmcHadronicProcess >( physicsManager_ )
|
||||
{
|
||||
productionModel = new ProductionModel;
|
||||
}
|
||||
|
||||
@@ -128,9 +128,9 @@ class CexmcHistoManager
|
||||
CexmcHistoAxisData() : nBins( 0 ), nBinsMin( 0 ), nBinsMax( 0 )
|
||||
{}
|
||||
|
||||
CexmcHistoAxisData( Int_t nBins, Double_t nBinsMin,
|
||||
Double_t nBinsMax ) :
|
||||
nBins( nBins ), nBinsMin( nBinsMin ), nBinsMax( nBinsMax )
|
||||
CexmcHistoAxisData( Int_t nBins_, Double_t nBinsMin_,
|
||||
Double_t nBinsMax_ ) :
|
||||
nBins( nBins_ ), nBinsMin( nBinsMin_ ), nBinsMax( nBinsMax_ )
|
||||
{}
|
||||
|
||||
Int_t nBins;
|
||||
@@ -156,14 +156,14 @@ class CexmcHistoManager
|
||||
isARHisto( false ), isARRec( false ), triggerType( CexmcTPT )
|
||||
{}
|
||||
|
||||
CexmcHistoData( CexmcHistoType type, CexmcHistoImpl impl,
|
||||
bool isARHisto, bool isARRec,
|
||||
CexmcTriggerType triggerType,
|
||||
const G4String & name, const G4String & title,
|
||||
const CexmcHistoAxes & axes ) :
|
||||
type( type ), impl( impl ), isARHisto( isARHisto ),
|
||||
isARRec( isARRec ), triggerType( triggerType ), name( name ),
|
||||
title( title ), axes( axes )
|
||||
CexmcHistoData( CexmcHistoType type_, CexmcHistoImpl impl_,
|
||||
bool isARHisto_, bool isARRec_,
|
||||
CexmcTriggerType triggerType_,
|
||||
const G4String & name_, const G4String & title_,
|
||||
const CexmcHistoAxes & axes_ ) :
|
||||
type( type_ ), impl( impl_ ), isARHisto( isARHisto_ ),
|
||||
isARRec( isARRec_ ), triggerType( triggerType_ ), name( name_ ),
|
||||
title( title_ ), axes( axes_ )
|
||||
{}
|
||||
|
||||
CexmcHistoType type;
|
||||
@@ -310,6 +310,7 @@ inline G4int CexmcHistoManager::GetVerboseLevel( void ) const
|
||||
return verboseLevel;
|
||||
}
|
||||
|
||||
#ifdef CEXMC_USE_ROOTQT
|
||||
|
||||
inline void CexmcHistoManager::AddHistoMenu( const G4String & handle,
|
||||
const G4String & label )
|
||||
@@ -335,7 +336,7 @@ inline void CexmcHistoManager::SetDrawOptions3D( const G4String & value )
|
||||
{
|
||||
drawOptions3D = value;
|
||||
}
|
||||
|
||||
#endif //CEXMC_USE_ROOTQT
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -51,8 +51,9 @@
|
||||
|
||||
struct CexmcPhaseSpaceOutVectorElement
|
||||
{
|
||||
CexmcPhaseSpaceOutVectorElement( G4LorentzVector * lVec, G4double mass ) :
|
||||
lVec( lVec ), mass( mass )
|
||||
CexmcPhaseSpaceOutVectorElement( G4LorentzVector * lVec_,
|
||||
G4double mass_ ) :
|
||||
lVec( lVec_ ), mass( mass_ )
|
||||
{}
|
||||
|
||||
G4LorentzVector * lVec;
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
#include "CexmcCommon.hh"
|
||||
|
||||
class CexmcReconstructorMessenger;
|
||||
class CexmcEnergyDepositStore;
|
||||
struct CexmcEnergyDepositStore;
|
||||
|
||||
|
||||
class CexmcReconstructor
|
||||
|
||||
@@ -63,9 +63,9 @@ struct CexmcSimpleRangeWithValue
|
||||
CexmcSimpleRangeWithValue()
|
||||
{}
|
||||
|
||||
CexmcSimpleRangeWithValue( G4double bottom, G4double top,
|
||||
G4double value ) :
|
||||
bottom( bottom ), top( top ), value( value )
|
||||
CexmcSimpleRangeWithValue( G4double bottom_, G4double top_,
|
||||
G4double value_ ) :
|
||||
bottom( bottom_ ), top( top_ ), value( value_ )
|
||||
{}
|
||||
|
||||
G4double bottom;
|
||||
|
||||
@@ -86,9 +86,10 @@ class CexmcStudiedPhysics : public G4VPhysicsConstructor
|
||||
|
||||
template < typename Process >
|
||||
CexmcStudiedPhysics< Process >::CexmcStudiedPhysics(
|
||||
CexmcPhysicsManager * physicsManager ) :
|
||||
G4VPhysicsConstructor( "studiedPhysics" ), physicsManager( physicsManager ),
|
||||
productionModel( NULL ), wasActivated( false )
|
||||
CexmcPhysicsManager * physicsManager_ ) :
|
||||
G4VPhysicsConstructor( "studiedPhysics" ),
|
||||
physicsManager( physicsManager_ ), productionModel( NULL ),
|
||||
wasActivated( false )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -55,20 +55,23 @@
|
||||
|
||||
struct CexmcTrackPointInfo
|
||||
{
|
||||
CexmcTrackPointInfo() : trackId( CexmcInvalidTrackId )
|
||||
{}
|
||||
// explicit argument is only needed by G4THitsMap template,
|
||||
// it has no actual use here
|
||||
explicit CexmcTrackPointInfo( G4double unused = 0. ) :
|
||||
momentumAmp ( unused ), trackId( CexmcInvalidTrackId )
|
||||
{}
|
||||
|
||||
CexmcTrackPointInfo( const G4ThreeVector & positionLocal,
|
||||
const G4ThreeVector & positionWorld,
|
||||
const G4ThreeVector & directionLocal,
|
||||
const G4ThreeVector & directionWorld,
|
||||
G4double momentumAmp,
|
||||
const G4ParticleDefinition * particle,
|
||||
G4int trackId, CexmcTrackType trackType ) :
|
||||
positionLocal( positionLocal ), positionWorld( positionWorld ),
|
||||
directionLocal( directionLocal ), directionWorld( directionWorld ),
|
||||
momentumAmp( momentumAmp ), particle( particle ), trackId( trackId ),
|
||||
trackType( trackType )
|
||||
CexmcTrackPointInfo( const G4ThreeVector & positionLocal_,
|
||||
const G4ThreeVector & positionWorld_,
|
||||
const G4ThreeVector & directionLocal_,
|
||||
const G4ThreeVector & directionWorld_,
|
||||
G4double momentumAmp_,
|
||||
const G4ParticleDefinition * particle_,
|
||||
G4int trackId_, CexmcTrackType trackType_ ) :
|
||||
positionLocal( positionLocal_ ), positionWorld( positionWorld_ ),
|
||||
directionLocal( directionLocal_ ), directionWorld( directionWorld_ ),
|
||||
momentumAmp( momentumAmp_ ), particle( particle_ ), trackId( trackId_ ),
|
||||
trackType( trackType_ )
|
||||
{}
|
||||
|
||||
G4bool IsValid( void ) const
|
||||
|
||||
@@ -50,27 +50,27 @@
|
||||
|
||||
struct CexmcTrackPointsStore
|
||||
{
|
||||
CexmcTrackPointsStore( const CexmcTrackPointInfo & monitorTP,
|
||||
const CexmcTrackPointInfo & targetTPBeamParticle,
|
||||
const CexmcTrackPointInfo & targetTPOutputParticle,
|
||||
const CexmcTrackPointInfo & targetTPNucleusParticle,
|
||||
const CexmcTrackPointInfo & targetTPOutputParticleDecayProductParticle1,
|
||||
const CexmcTrackPointInfo & targetTPOutputParticleDecayProductParticle2,
|
||||
const CexmcTrackPointInfo & vetoCounterTPLeft,
|
||||
const CexmcTrackPointInfo & vetoCounterTPRight,
|
||||
const CexmcTrackPointInfo & calorimeterTPLeft,
|
||||
const CexmcTrackPointInfo & calorimeterTPRight ) :
|
||||
monitorTP( monitorTP ), targetTPBeamParticle( targetTPBeamParticle ),
|
||||
targetTPOutputParticle( targetTPOutputParticle ),
|
||||
targetTPNucleusParticle( targetTPNucleusParticle ),
|
||||
CexmcTrackPointsStore( const CexmcTrackPointInfo & monitorTP_,
|
||||
const CexmcTrackPointInfo & targetTPBeamParticle_,
|
||||
const CexmcTrackPointInfo & targetTPOutputParticle_,
|
||||
const CexmcTrackPointInfo & targetTPNucleusParticle_,
|
||||
const CexmcTrackPointInfo & targetTPOutputParticleDecayProductParticle1_,
|
||||
const CexmcTrackPointInfo & targetTPOutputParticleDecayProductParticle2_,
|
||||
const CexmcTrackPointInfo & vetoCounterTPLeft_,
|
||||
const CexmcTrackPointInfo & vetoCounterTPRight_,
|
||||
const CexmcTrackPointInfo & calorimeterTPLeft_,
|
||||
const CexmcTrackPointInfo & calorimeterTPRight_ ) :
|
||||
monitorTP( monitorTP_ ), targetTPBeamParticle( targetTPBeamParticle_ ),
|
||||
targetTPOutputParticle( targetTPOutputParticle_ ),
|
||||
targetTPNucleusParticle( targetTPNucleusParticle_ ),
|
||||
targetTPOutputParticleDecayProductParticle1(
|
||||
targetTPOutputParticleDecayProductParticle1 ),
|
||||
targetTPOutputParticleDecayProductParticle1_ ),
|
||||
targetTPOutputParticleDecayProductParticle2(
|
||||
targetTPOutputParticleDecayProductParticle2 ),
|
||||
vetoCounterTPLeft( vetoCounterTPLeft ),
|
||||
vetoCounterTPRight( vetoCounterTPRight ),
|
||||
calorimeterTPLeft( calorimeterTPLeft ),
|
||||
calorimeterTPRight( calorimeterTPRight )
|
||||
targetTPOutputParticleDecayProductParticle2_ ),
|
||||
vetoCounterTPLeft( vetoCounterTPLeft_ ),
|
||||
vetoCounterTPRight( vetoCounterTPRight_ ),
|
||||
calorimeterTPLeft( calorimeterTPLeft_ ),
|
||||
calorimeterTPRight( calorimeterTPRight_ )
|
||||
{}
|
||||
|
||||
void * operator new( size_t size );
|
||||
|
||||
Reference in New Issue
Block a user