--- 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 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- also schema located at "/usr/local/share/GDML_3_0_0/schema/gdml.xsd -->
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:gdml="http://cern.ch/2001/Schemas/GDML"
     xsi:noNamespaceSchemaLocation=
@@ -19,24 +18,6 @@
         <constant name="NCrystalsHor" value="6"/>
         <constant name="NCrystalsVert" value="4"/>
 
-        <!-- sensitive detector roles; -->
-        <!-- a single logical volume may have only one detector role, -->
-        <!-- for example vMonitor may not have MonitorRole and TargetRole -->
-        <!-- simultaneously -->
-        <constant name="MonitorRole" value="0"/>
-        <constant name="VetoCounterRole" value="1"/>
-        <constant name="CalorimeterRole" value="2"/>
-        <constant name="TargetRole" value="3"/>
-
-        <!-- region types -->
-        <constant name="CalorimeterRegion" value="0"/>
-
-        <!-- special volumes -->
-        <constant name="MonitorVolume" value="0"/>
-        <constant name="VetoCounterVolume" value="1"/>
-        <constant name="CalorimeterVolume" value="2"/>
-        <constant name="TargetVolume" value="3"/>
-
 
         <!-- these values are supposed to be changed -->
         <constant name="MonitorPosZ" value="-34.0"/>
@@ -377,7 +358,7 @@
         <volume name="vMonitor">
             <materialref ref="Scintillator"/>
             <solidref ref="sMonitor"/>
-            <auxiliary auxtype="SpecialVolume" auxvalue="MonitorVolume"/>
+            <auxiliary auxtype="SpecialVolume" auxvalue="Monitor"/>
             <auxiliary auxtype="EnergyDepositDetector" auxvalue="MonitorRole"/>
             <auxiliary auxtype="TrackPointsDetector" auxvalue="MonitorRole"/>
         </volume>
@@ -388,7 +369,7 @@
         <volume name="vTarget">
             <materialref ref="G4_lH2"/>
             <solidref ref="sTarget"/>
-            <auxiliary auxtype="SpecialVolume" auxvalue="TargetVolume"/>
+            <auxiliary auxtype="SpecialVolume" auxvalue="Target"/>
             <auxiliary auxtype="TrackPointsDetector" auxvalue="TargetRole"/>
         </volume>
         <volume name="vTargetInnerCover">
@@ -454,13 +435,13 @@
                     <offset value="0" unit="cm"/>
                 </replicate_along_axis>
             </replicavol>
-            <auxiliary auxtype="SpecialVolume" auxvalue="CalorimeterVolume"/>
+            <auxiliary auxtype="SpecialVolume" auxvalue="Calorimeter"/>
             <auxiliary auxtype="SensitiveRegion" auxvalue="CalorimeterRegion"/>
         </volume>
         <volume name="vVetoCounter">
             <materialref ref="Scintillator"/>
             <solidref ref="sVetoCounter"/>
-            <auxiliary auxtype="SpecialVolume" auxvalue="VetoCounterVolume"/>
+            <auxiliary auxtype="SpecialVolume" auxvalue="VetoCounter"/>
             <auxiliary auxtype="EnergyDepositDetector"
                        auxvalue="VetoCounterRole"/>
             <auxiliary auxtype="TrackPointsDetector"
--- src/CexmcSetup.cc	2010-12-17 12:24:06.000000000 +0300
+++ src/CexmcSetup.cc.new	2010-12-17 17:56:35.000000000 +0300
@@ -134,7 +134,7 @@
                 {
                     do
                     {
-                        if ( pair->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 '";