Import Geant4 10.5.1 source tree

2019-04-17 10:39:02 +02:00
parent a7fdc52004
commit 28a70706e0
661 changed files with 55791 additions and 106984 deletions
@@ -7,6 +7,13 @@ cirrone@lns.infn.it
             History file of the ChargeExchangeMC application
         ====================================================

+31.01.2019 - G.Cosmo, Tag ChargeExchangeMC-V10-04-01
+             Fixed compilation warnings for unused data when no analysis set.
+             Fixed regular expression error in schema validation for lht.gdml.
+
+31.01.2019 - I.Hrivnacova
+             Merged GitHub PR #4: all Boolean operators now return G4bool.
+
 09.11.2018 - G.Cosmo, Tag ChargeExchangeMC-V10-04-00
             CexmcException: fixed typo in printout.

@@ -82,7 +82,7 @@ inline void  CexmcAngularRange::serialize( Archive &  archive,
 }


-inline bool  operator<( const CexmcAngularRange &  left,
+inline G4bool  operator<( const CexmcAngularRange &  left,
                        const CexmcAngularRange &  right )
 {
    if ( left.top != right.top )
@@ -94,7 +94,7 @@ inline void

 template  < CexmcValueCategory  RangeCategory,
            CexmcValueCategory  ValueCategory >
-inline bool  operator<(
+inline G4bool  operator<(
    const CexmcSimpleRangeWithValue< RangeCategory, ValueCategory > &  left,
    const CexmcSimpleRangeWithValue< RangeCategory, ValueCategory > &  right )
 {
@@ -449,7 +449,7 @@
        <volume name="vCrystalRow">
            <materialref ref="G4_AIR"/>
            <solidref ref="sCrystalRow"/>
-            <replicavol number="NCrystalsHor">
+            <replicavol number="6">
                <volumeref ref="vCrystal"/>
                <replicate_along_axis>
                    <direction x="1"/>
@@ -461,7 +461,7 @@
        <volume name="vCalorimeter">
            <materialref ref="G4_AIR"/>
            <solidref ref="sCalorimeter"/>
-            <replicavol number="NCrystalsVert">
+            <replicavol number="4">
                <volumeref ref="vCrystalRow"/>
                <replicate_along_axis>
                    <direction y="1"/>
@@ -92,8 +92,10 @@ namespace
    const G4double  CexmcHistoMissEnergyResolution( 0.2 * MeV );
    const G4double  CexmcHistoAngularResolution( 0.5 );
    const G4double  CexmcHistoAngularCResolution( 0.001 );
+#ifdef CEXMC_USE_ROOTQT
    const G4int     CexmcHistoCanvasWidth( 800 );
    const G4int     CexmcHistoCanvasHeight( 600 );
+#endif
    const G4String  CexmcHistoDirectoryHandle( "histograms" );
    const G4String  CexmcHistoDirectoryTitle( "Histograms" );
 }