--- lht.gdml 2010-12-17 12:24:04.000000000 +0300 +++ lht.gdml.new 2010-12-17 17:51:05.000000000 +0300 @@ -1,5 +1,4 @@ - - - - - - - - - - - - - - - - - - - @@ -377,7 +358,7 @@ - + @@ -388,7 +369,7 @@ - + @@ -454,13 +435,13 @@ - + - + value < 0.5 ) + if ( pair->value == "MonitorRole" ) { AssertAndAsignDetectorRole( curDetectorRole, CexmcMonitorDetectorRole ); @@ -142,7 +142,7 @@ CexmcDetectorTypeName[ CexmcEDDetector ] ); break; } - if ( pair->value < 1.5 ) + if ( pair->value == "VetoCounterRole" ) { AssertAndAsignDetectorRole( curDetectorRole, CexmcVetoCounterDetectorRole ); @@ -151,7 +151,7 @@ this ); break; } - if ( pair->value < 2.5 ) + if ( pair->value == "CalorimeterRole" ) { AssertAndAsignDetectorRole( curDetectorRole, CexmcCalorimeterDetectorRole ); @@ -171,7 +171,7 @@ { do { - if ( pair->value < 0.5 ) + if ( pair->value == "MonitorRole" ) { AssertAndAsignDetectorRole( curDetectorRole, CexmcMonitorDetectorRole ); @@ -179,7 +179,7 @@ CexmcDetectorTypeName[ CexmcTPDetector ] ); break; } - if ( pair->value < 1.5 ) + if ( pair->value == "VetoCounterRole" ) { AssertAndAsignDetectorRole( curDetectorRole, CexmcVetoCounterDetectorRole ); @@ -188,7 +188,7 @@ this ); break; } - if ( pair->value < 2.5 ) + if ( pair->value == "CalorimeterRole" ) { AssertAndAsignDetectorRole( curDetectorRole, CexmcCalorimeterDetectorRole ); @@ -197,7 +197,7 @@ this ); break; } - if ( pair->value < 3.5 ) + if ( pair->value == "TargetRole" ) { AssertAndAsignDetectorRole( curDetectorRole, CexmcTargetDetectorRole ); @@ -222,7 +222,7 @@ { do { - if ( pair->value < 0.5 ) + if ( pair->value == "CalorimeterRegion" ) { G4Region * region( NULL ); if ( calorimeterRegionInitialized ) @@ -260,19 +260,19 @@ { do { - if ( pair->value < 0.5 ) + if ( pair->value == "Monitor" ) { monitorVolume = *lvIter; G4cout << CEXMC_LINE_START "Monitor volume '"; break; } - if ( pair->value < 1.5 ) + if ( pair->value == "VetoCounter" ) { vetoCounterVolume = *lvIter; G4cout << CEXMC_LINE_START "VetoCounter volume '"; break; } - if ( pair->value < 2.5 ) + if ( pair->value == "Calorimeter" ) { calorimeterVolume = *lvIter; G4cout << CEXMC_LINE_START "Calorimeter volume '"; @@ -280,7 +280,7 @@ calorimeterGeometryDataInitialized = true; break; } - if ( pair->value < 3.5 ) + if ( pair->value == "Target" ) { targetVolume = *lvIter; G4cout << CEXMC_LINE_START "Target volume '";