lcdd/include

diff -u -r1.16 -r1.17
--- LCDDProcessor.hh	9 Jul 2005 00:25:55 -0000	1.16
+++ LCDDProcessor.hh	18 Nov 2005 22:31:24 -0000	1.17
@@ -36,7 +36,7 @@

   typedef std::map<std::string, G4MagneticField*> MagneticFields;
   typedef std::map<std::string, G4Region*> Regions;
   typedef std::map<std::string, G4VisAttributes*> VisAttributes;

-  typedef std::map<std::string, G4UserLimits*> UserLimits;

+  //  typedef std::map<std::string, G4UserLimits*> UserLimits;

   typedef std::map<std::string, G4LimitSet*> LimitSets;
 
 public:

@@ -91,19 +91,12 @@

   LCDDProcessor::Regions::const_iterator getRegionsBegin();
   LCDDProcessor::Regions::const_iterator getRegionsEnd();
 

-  // user limits
-  void addUserLimits(std::string& name, G4UserLimits* lim);
-
-  G4UserLimits* getUserLimits(const std::string& name);
-  G4UserLimits* getUserLimits(const char* name);
-
-  LCDDProcessor::UserLimits::const_iterator getUserLimitsBegin();
-  LCDDProcessor::UserLimits::const_iterator getUserLimitsEnd();
-

   // user limit set
   void addLimitSet(std::string& name, G4LimitSet* lim);
   G4LimitSet* getLimitSet(const std::string& name);
   G4LimitSet* getLimitSet(const char* name);

+  LCDDProcessor::LimitSets::const_iterator getLimitSetsBegin();
+  LCDDProcessor::LimitSets::const_iterator getLimitSetsEnd();

 
   // Vis Attributes
   void addVisAttributes(std::string& name, G4VisAttributes* vis);

@@ -124,7 +117,6 @@

   LCDDProcessor::MagneticFields m_magneticFields;
   LCDDProcessor::Regions m_regions;
   LCDDProcessor::VisAttributes m_visAttributes;

-  LCDDProcessor::UserLimits m_userLimits;

   LCDDProcessor::LimitSets m_limitSets;
 
   // was global field setup?

lcdd/src

diff -u -r1.11 -r1.12
--- LCDDProcessor.cc	9 Jul 2005 00:25:57 -0000	1.11
+++ LCDDProcessor.cc	18 Nov 2005 22:31:24 -0000	1.12
@@ -168,33 +168,6 @@

   return m_visAttributes.end();
 }
 

-// user limits
-void LCDDProcessor::addUserLimits(std::string& name, G4UserLimits* lim)
-{
-  m_userLimits[name] = lim;
-}
-
-G4UserLimits* LCDDProcessor::getUserLimits(const std::string& name)
-{
-  return m_userLimits[name];
-}
-
-G4UserLimits* LCDDProcessor::getUserLimits(const char* name)
-{
-  std::string key = name;
-  return getUserLimits(key);
-}
-
-LCDDProcessor::UserLimits::const_iterator LCDDProcessor::getUserLimitsBegin()
-{
-  return m_userLimits.begin();
-}
-
-LCDDProcessor::UserLimits::const_iterator LCDDProcessor::getUserLimitsEnd()
-{
-  return m_userLimits.end();
-}
-

 void LCDDProcessor::addLimitSet(std::string& name, G4LimitSet* lim)
 {
   m_limitSets[name] = lim;

@@ -210,3 +183,13 @@

   std::string key = name;
   return getLimitSet(key);
 }

+
+LCDDProcessor::LimitSets::const_iterator LCDDProcessor::getLimitSetsBegin()
+{
+  return m_limitSets.begin();
+}
+
+LCDDProcessor::LimitSets::const_iterator LCDDProcessor::getLimitSetsEnd()
+{
+  return m_limitSets.end();
+}