Commit in lcdd on MAIN
src/LCDDDetectorConstruction.cc+5-11.12 -> 1.13
include/StoreInspector.hh+3-31.8 -> 1.9
       /PhysVolIdMap.hh+3-41.3 -> 1.4
       /LCDDObjectStoreInspector.hh+11.3 -> 1.4
       /LCDDMessenger.hh+3-31.4 -> 1.5
       /LCDDDetectorConstruction.hh+3-11.4 -> 1.5
       /G4StoreManager.hh+3-31.5 -> 1.6
       /G4NonprojectiveCylinderSegmentation.hh+6-11.5 -> 1.6
+27-16
8 modified files
JM: Make LCDDObjectStoreInspector initialized with LCDDDetectorConstruction.  Also, fix up inconstistent include guard names.

lcdd/src
LCDDDetectorConstruction.cc 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- LCDDDetectorConstruction.cc	9 May 2006 01:56:35 -0000	1.12
+++ LCDDDetectorConstruction.cc	16 Feb 2007 02:04:47 -0000	1.13
@@ -1,9 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/LCDDDetectorConstruction.cc,v 1.12 2006/05/09 01:56:35 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/LCDDDetectorConstruction.cc,v 1.13 2007/02/16 02:04:47 jeremy Exp $
 
 // LCDD
 #include "LCDDDetectorConstruction.hh"
 #include "LCDDProcessor.hh"
 #include "LCDDMessenger.hh"
+#include "LCDDObjectStoreInspector.hh"
 #include "GDMLWriterMessenger.hh"
 #include "LCDDParser.hh"
 #include "GeometryManager.hh"
@@ -30,10 +31,13 @@
 
   // setup parser if not already
   LCDDParser::instance();
+
+  m_inspector = new LCDDObjectStoreInspector();
 }
 
 LCDDDetectorConstruction::~LCDDDetectorConstruction()
 {
+  delete m_inspector;
   delete m_writerMessenger;
   delete m_messenger;
 }

lcdd/include
StoreInspector.hh 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- StoreInspector.hh	18 Dec 2006 22:49:02 -0000	1.8
+++ StoreInspector.hh	16 Feb 2007 02:04:47 -0000	1.9
@@ -1,6 +1,6 @@
-// $Header: /cvs/lcd/lcdd/include/StoreInspector.hh,v 1.8 2006/12/18 22:49:02 jeremy Exp $
-#ifndef lcdd_LCDD_STOREINSPECTOR_HH
-#define lcdd_LCDD_STOREINSPECTOR_HH 1
+// $Header: /cvs/lcd/lcdd/include/StoreInspector.hh,v 1.9 2007/02/16 02:04:47 jeremy Exp $
+#ifndef LCDD_STOREINSPECTOR_HH
+#define LCDD_STOREINSPECTOR_HH 1
 
 // geant4
 #include "G4UIcmdWithAString.hh"

lcdd/include
PhysVolIdMap.hh 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- PhysVolIdMap.hh	8 Feb 2005 03:20:39 -0000	1.3
+++ PhysVolIdMap.hh	16 Feb 2007 02:04:47 -0000	1.4
@@ -1,7 +1,6 @@
-// $Header: /cvs/lcd/lcdd/include/PhysVolIdMap.hh,v 1.3 2005/02/08 03:20:39 jeremy Exp $
-
-#ifndef PhysVolToIdMap_hh
-#define PhysVolToIdMap_hh
+// $Header: /cvs/lcd/lcdd/include/PhysVolIdMap.hh,v 1.4 2007/02/16 02:04:47 jeremy Exp $
+#ifndef LCDD_PHYSVOLTOIDMAP_HH
+#define LCDD_PHYSVOLTOIDMAP_HH 1
 
 // LCDD
 #include "PhysVolId.hh"

lcdd/include
LCDDObjectStoreInspector.hh 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- LCDDObjectStoreInspector.hh	18 Dec 2006 22:49:02 -0000	1.3
+++ LCDDObjectStoreInspector.hh	16 Feb 2007 02:04:47 -0000	1.4
@@ -1,3 +1,4 @@
+// $Id: LCDDObjectStoreInspector.hh,v 1.4 2007/02/16 02:04:47 jeremy Exp $
 #ifndef LCDD_LCDDOBJECTSTOREINSPECTOR_HH
 #define LCDD_LCDDOBJECTSTOREINSPECTOR_HH 1
 

lcdd/include
LCDDMessenger.hh 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- LCDDMessenger.hh	22 Nov 2006 02:24:49 -0000	1.4
+++ LCDDMessenger.hh	16 Feb 2007 02:04:47 -0000	1.5
@@ -1,7 +1,7 @@
-// $Header: /cvs/lcd/lcdd/include/LCDDMessenger.hh,v 1.4 2006/11/22 02:24:49 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/LCDDMessenger.hh,v 1.5 2007/02/16 02:04:47 jeremy Exp $
 
-#ifndef LCDDMessenger_h
-#define LCDDMessenger_h 1
+#ifndef LCDD_LCDDMESSENGER_HH
+#define LCDD_LCDDMESSENGER_HH 1
 
 #include "G4UImessenger.hh"
 

lcdd/include
LCDDDetectorConstruction.hh 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- LCDDDetectorConstruction.hh	17 Nov 2005 19:59:43 -0000	1.4
+++ LCDDDetectorConstruction.hh	16 Feb 2007 02:04:47 -0000	1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/LCDDDetectorConstruction.hh,v 1.4 2005/11/17 19:59:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/LCDDDetectorConstruction.hh,v 1.5 2007/02/16 02:04:47 jeremy Exp $
 
 #ifndef LCDDDetectorConstruction_h
 #define LCDDDetectorConstruction_h 1
@@ -9,6 +9,7 @@
 #include <string>
 
 class LCDDDetectorConstructionMessenger;
+class LCDDObjectStoreInspector;
 
 /**
    @class LCDDDetectorConstruction
@@ -34,6 +35,7 @@
   G4UImessenger* m_messenger;
   G4UImessenger* m_writerMessenger;
   G4VPhysicalVolume* m_world;
+  LCDDObjectStoreInspector* m_inspector;
 
   std::string m_URI;
   std::string m_setupName;

lcdd/include
G4StoreManager.hh 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- G4StoreManager.hh	9 Dec 2005 01:55:55 -0000	1.5
+++ G4StoreManager.hh	16 Feb 2007 02:04:47 -0000	1.6
@@ -1,7 +1,7 @@
-// $Header: /cvs/lcd/lcdd/include/G4StoreManager.hh,v 1.5 2005/12/09 01:55:55 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4StoreManager.hh,v 1.6 2007/02/16 02:04:47 jeremy Exp $
 
-#ifndef G4StoreManager_h
-#define G4StoreManager_h 1
+#ifndef LCDD_G4STOREMANAGER_HH
+#define LCDD_G4STOREMANAGER_HH 1
 
 // FIXME: This class actually needs to do something besides just creating "/stores/" cmd dir.
 

lcdd/include
G4NonprojectiveCylinderSegmentation.hh 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- G4NonprojectiveCylinderSegmentation.hh	27 Jun 2005 20:40:34 -0000	1.5
+++ G4NonprojectiveCylinderSegmentation.hh	16 Feb 2007 02:04:47 -0000	1.6
@@ -1,4 +1,7 @@
-// $Header: /cvs/lcd/lcdd/include/G4NonprojectiveCylinderSegmentation.hh,v 1.5 2005/06/27 20:40:34 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4NonprojectiveCylinderSegmentation.hh,v 1.6 2007/02/16 02:04:47 jeremy Exp $
+#ifndef LCDD_G4NONPROJECTIVECYLINDERSEGMENTATION
+#define LCDD_G4NONPROJECTIVECYLINDERSEGMENTATION 1
+
 #include "G4Segmentation.hh"
 
 /**
@@ -38,3 +41,5 @@
   double m_gridSizePhi;
   double m_gridSizeZ;
 };
+
+#endif
CVSspam 0.2.8