diff -N LCDDObjectStoreInspector.hh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ LCDDObjectStoreInspector.hh	17 May 2006 02:52:48 -0000	1.1
@@ -0,0 +1,55 @@

+#ifndef LCDDObjectStoreInspector_hh
+#define LCDDObjectStoreInspector_hh 1
+
+// lcdd
+#include "StoreInspector.hh"
+
+/**
+ * A class to create the templated object store inspectors for looking
+ * at Geant4 stores created by LCDD.
+ */
+class LCDDObjectStoreInspector
+{
+public:
+
+  LCDDObjectStoreInspector()
+  {
+    m_materialInspector = new G4MaterialStoreInspector("G4Material", G4Material::GetMaterialTable());
+    m_solidInspector    = new G4SolidStoreInspector("G4VSolid", G4SolidStore::GetInstance());
+    m_limitsetInspector = new G4LimitSetInspector("G4LimitSet", LCDDProcessor::instance()->getLimitSetStore());
+    m_lvolumeInspector  = new G4LogicalVolumeStoreInspector("G4LogicalVolume", G4LogicalVolumeStore::GetInstance());
+    m_pvolumeInspector  = new G4PhysicalVolumeStoreInspector("G4VPhysicalVolume", G4PhysicalVolumeStore::GetInstance());
+    m_idspecInspector   = new IdSpecInspector("IdSpec", IdManager::instance()->getIdSpecStore());
+    m_sdInspector       = new G4SensitiveDetectorInspector("G4SensitiveDetector", LCDDProcessor::instance()->getSensitiveDetectorStore());
+    m_regionInspector   = new G4RegionStoreInspector("G4Region", G4RegionStore::GetInstance());
+    m_fieldInspector    = new G4MagneticFieldInspector("G4MagneticField", LCDDProcessor::instance()->getMagneticFieldStore() );
+    m_visInspector      = new G4VisAttributeInspector("G4VisAttributes", LCDDProcessor::instance()->getVisAttributesStore() );
+  }
+
+  virtual ~LCDDObjectStoreInspector()
+  {
+    delete m_materialInspector;
+    delete m_solidInspector;
+    delete m_limitsetInspector;
+    delete m_lvolumeInspector;
+    delete m_idspecInspector;
+    delete m_sdInspector;
+    delete m_regionInspector;
+    delete m_fieldInspector;
+    delete m_visInspector;
+  }
+
+private:
+  G4MaterialStoreInspector* m_materialInspector;
+  G4SolidStoreInspector* m_solidInspector;
+  G4LimitSetInspector* m_limitsetInspector;
+  G4LogicalVolumeStoreInspector* m_lvolumeInspector;
+  G4PhysicalVolumeStoreInspector* m_pvolumeInspector;
+  IdSpecInspector* m_idspecInspector;
+  G4SensitiveDetectorInspector* m_sdInspector;
+  G4RegionStoreInspector* m_regionInspector;
+  G4MagneticFieldInspector* m_fieldInspector;
+  G4VisAttributeInspector* m_visInspector;
+};
+
+#endif

diff -u -r1.4 -r1.5
--- StoreInspector.hh	9 Feb 2006 03:12:18 -0000	1.4
+++ StoreInspector.hh	17 May 2006 02:52:48 -0000	1.5
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/StoreInspector.hh,v 1.4 2006/02/09 03:12:18 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/StoreInspector.hh,v 1.5 2006/05/17 02:52:48 jeremy Exp $

 #ifndef lcdd_StoreInspector_hh
 #define lcdd_StoreInspector_hh 1
 

@@ -175,14 +175,14 @@

 #include "G4MaterialTable.hh"
 
 typedef StoreInspector< G4Material, G4MaterialTable > G4MaterialStoreInspector;

-G4MaterialStoreInspector materialInspector( "G4Material", G4Material::GetMaterialTable() );

+//G4MaterialStoreInspector materialInspector( "G4Material", G4Material::GetMaterialTable() );

 
 /* solid */
 #include "G4VSolid.hh"
 #include "G4SolidStore.hh"
 
 typedef StoreInspector< G4VSolid, G4SolidStore > G4SolidStoreInspector;

-G4SolidStoreInspector solidInspector( "G4VSolid", G4SolidStore::GetInstance() );

+//G4SolidStoreInspector solidInspector( "G4VSolid", G4SolidStore::GetInstance() );

 
 /* limit set */
 #include "G4LimitSet.hh"

@@ -233,7 +233,7 @@

 
 
 typedef StoreInspector< G4LimitSet, LCDDProcessor::LimitSets > G4LimitSetInspector;

-G4LimitSetInspector limitsetInspector( "G4LimitSet", LCDDProcessor::instance()->getLimitSetStore() );

+//G4LimitSetInspector limitsetInspector( "G4LimitSet", LCDDProcessor::instance()->getLimitSetStore() );

 
 /* lvolume */
 #include "G4LogicalVolume.hh"

@@ -292,7 +292,7 @@

 }
 
 typedef StoreInspector< G4LogicalVolume, G4LogicalVolumeStore > G4LogicalVolumeStoreInspector;

-G4LogicalVolumeStoreInspector lvolumeInspector( "G4LogicalVolume", G4LogicalVolumeStore::GetInstance() );

+//G4LogicalVolumeStoreInspector lvolumeInspector( "G4LogicalVolume", G4LogicalVolumeStore::GetInstance() );

 
 /* pvolume */
 #include "G4VPhysicalVolume.hh"

@@ -316,7 +316,7 @@

 }
 
 typedef StoreInspector< G4VPhysicalVolume, G4PhysicalVolumeStore > G4PhysicalVolumeStoreInspector;

-G4PhysicalVolumeStoreInspector pvolumeInspector( "G4VPhysicalVolume", G4PhysicalVolumeStore::GetInstance() );

+//G4PhysicalVolumeStoreInspector pvolumeInspector( "G4VPhysicalVolume", G4PhysicalVolumeStore::GetInstance() );

 
 /* idspec */
 #include "IdManager.hh"

@@ -336,7 +336,7 @@

 }
 
 typedef StoreInspector< IdSpec, IdManager::IdSpecs > IdSpecInspector;

-IdSpecInspector idspecInspector( "IdSpec", IdManager::instance()->getIdSpecStore() );

+//IdSpecInspector idspecInspector( "IdSpec", IdManager::instance()->getIdSpecStore() );

 
 /* SD */
 #include "G4SensitiveDetector.hh" // use LCDD's concrete SD class

@@ -355,7 +355,7 @@

 }
 
 typedef StoreInspector< G4SensitiveDetector, LCDDProcessor::SensitiveDetectors > G4SensitiveDetectorInspector;

-G4SensitiveDetectorInspector sdInspector( "G4SensitiveDetector", LCDDProcessor::instance()->getSensitiveDetectorStore() );

+//G4SensitiveDetectorInspector sdInspector( "G4SensitiveDetector", LCDDProcessor::instance()->getSensitiveDetectorStore() );

 
 /* region */
 #include "G4Region.hh"

@@ -381,7 +381,7 @@

 }
 
 typedef StoreInspector< G4Region, G4RegionStore > G4RegionStoreInspector;

-G4RegionStoreInspector regionInspector( "G4Region", G4RegionStore::GetInstance() );

+//G4RegionStoreInspector regionInspector( "G4Region", G4RegionStore::GetInstance() );

 
 /* mag field */
 #include "G4MagneticField.hh"

@@ -393,7 +393,7 @@

 }
 
 typedef StoreInspector< G4MagneticField, LCDDProcessor::MagneticFields > G4MagneticFieldInspector;

-G4MagneticFieldInspector fieldInspector( "G4MagneticField", LCDDProcessor::instance()->getMagneticFieldStore() );

+//G4MagneticFieldInspector fieldInspector( "G4MagneticField", LCDDProcessor::instance()->getMagneticFieldStore() );

 
 /* vis attrib */
 #include "G4VisAttributes.hh"

diff -u -r1.9 -r1.10
--- StringUtil.cc	22 Sep 2005 00:55:36 -0000	1.9
+++ StringUtil.cc	17 May 2006 02:52:48 -0000	1.10
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/StringUtil.cc,v 1.9 2005/09/22 00:55:36 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/StringUtil.cc,v 1.10 2006/05/17 02:52:48 jeremy Exp $

 
 #include "StringUtil.hh"
 

@@ -130,16 +130,15 @@

   // Find first "non-delimiter".
   string::size_type pos = str.find_first_of(delimiters, lastPos);
 

-  while (string::npos != pos || string::npos != lastPos)
-    {

+  while (string::npos != pos || string::npos != lastPos) {

-      // Found a token, add it to the vector.
-      tokens.push_back(str.substr(lastPos, pos - lastPos));

+    // Found a token, add it to the vector.
+    tokens.push_back(str.substr(lastPos, pos - lastPos));

-      // Skip delimiters.  Note the "not_of"
-      lastPos = str.find_first_not_of(delimiters, pos);

+    // Skip delimiters.  Note the "not_of"
+    lastPos = str.find_first_not_of(delimiters, pos);

-      // Find next "non-delimiter"
-      pos = str.find_first_of(delimiters, lastPos);
-    }

+    // Find next "non-delimiter"
+    pos = str.find_first_of(delimiters, lastPos);
+  }

 }