6 modified files
lcdd/include/lcdd/bfield
diff -u -r1.1 -r1.2
--- G4BoxField.hh 26 Jun 2013 01:32:44 -0000 1.1
+++ G4BoxField.hh 27 Jun 2013 23:42:24 -0000 1.2
@@ -1,3 +1,4 @@
+// FIXME: remove this class???
class G4BoxField
{
lcdd/include/lcdd/core
diff -u -r1.1 -r1.2
--- G4StoreManager.hh 26 Jun 2013 01:32:45 -0000 1.1
+++ G4StoreManager.hh 27 Jun 2013 23:42:24 -0000 1.2
@@ -1,14 +1,13 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/G4StoreManager.hh,v 1.1 2013/06/26 01:32:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/core/G4StoreManager.hh,v 1.2 2013/06/27 23:42:24 jeremy Exp $
#ifndef LCDD_G4STOREMANAGER_HH
#define LCDD_G4STOREMANAGER_HH 1
-// FIXME: This class actually needs to do something besides just creating "/stores/" cmd dir.
+// FIXME: This class actually needs to do something besides just creating "/stores/" cmd dir. Probably it can
+// be removed and the command directory creation moved elsewhere.
/**
- @class G4StoreManager G4StoreManager.hh
- @brief Singleton manager class for retrieval of
- G4 solids, LV, PV and regions from stores.
+ @brief Singleton manager class for retrieval of G4 solids, LV, PV and regions from stores.
@note Can also dumps/clear G4 stores.
*/
class G4StoreManager
lcdd/include/lcdd/core
diff -u -r1.1 -r1.2
--- GeometryManager.hh 26 Jun 2013 01:32:45 -0000 1.1
+++ GeometryManager.hh 27 Jun 2013 23:42:24 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/GeometryManager.hh,v 1.1 2013/06/26 01:32:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/core/GeometryManager.hh,v 1.2 2013/06/27 23:42:24 jeremy Exp $
#ifndef LCDD_GEOMETRYMANAGER_HH
#define LCDD_GEOMETRYMANAGER_HH 1
@@ -43,7 +43,7 @@
*/
void setupWorldRegionInformation();
-#ifdef HAVE_G4PVPLACEMENT_CHECKOVERLAPS
+//#ifdef HAVE_G4PVPLACEMENT_CHECKOVERLAPS
/**
* Check overlaps starting with the world volume
@@ -64,7 +64,7 @@
*/
void checkOverlaps(const G4String&, bool recurse=true) const;
-#endif
+//#endif
private:
lcdd/include/lcdd/core
diff -u -r1.1 -r1.2
--- LCDDObjectStoreInspector.hh 26 Jun 2013 01:32:45 -0000 1.1
+++ LCDDObjectStoreInspector.hh 27 Jun 2013 23:42:24 -0000 1.2
@@ -1,4 +1,4 @@
-// $Id: LCDDObjectStoreInspector.hh,v 1.1 2013/06/26 01:32:45 jeremy Exp $
+// $Id: LCDDObjectStoreInspector.hh,v 1.2 2013/06/27 23:42:24 jeremy Exp $
#ifndef LCDD_LCDDOBJECTSTOREINSPECTOR_HH
#define LCDD_LCDDOBJECTSTOREINSPECTOR_HH 1
@@ -8,10 +8,11 @@
#include "lcdd/core/LCDDProcessor.hh"
/**
- * @brief Creates the templated object store inspectors for looking at Geant4 stores created by LCDD.
+ * @brief Creates the inspector instances for looking at Geant4 LCDD object stores.
*/
class LCDDObjectStoreInspector
{
+
public:
LCDDObjectStoreInspector()
@@ -34,6 +35,7 @@
delete m_solidInspector;
delete m_limitsetInspector;
delete m_lvolumeInspector;
+ delete m_pvolumeInspector;
delete m_idspecInspector;
delete m_sdInspector;
delete m_regionInspector;
@@ -42,6 +44,7 @@
}
private:
+
G4MaterialStoreInspector* m_materialInspector;
G4SolidStoreInspector* m_solidInspector;
G4LimitSetInspector* m_limitsetInspector;
lcdd/include/lcdd/detectors
diff -u -r1.1 -r1.2
--- SensitiveDetectorMessenger.hh 26 Jun 2013 01:32:45 -0000 1.1
+++ SensitiveDetectorMessenger.hh 27 Jun 2013 23:42:24 -0000 1.2
@@ -34,12 +34,10 @@
private:
- static G4UIdirectory* m_detectorsDir;
-
G4SensitiveDetector* m_detector;
+ static G4UIdirectory* m_detectorsDir;
G4UIdirectory* m_detectorDir;
-
G4UIcommand* m_printInfoCmd;
G4UIcommand* m_printHitsCmd;
G4UIcommand* m_printVolumesCmd;
lcdd/include/lcdd/util
diff -u -r1.1 -r1.2
--- StoreInspector.hh 26 Jun 2013 01:32:48 -0000 1.1
+++ StoreInspector.hh 27 Jun 2013 23:42:24 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/util/StoreInspector.hh,v 1.1 2013/06/26 01:32:48 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/util/StoreInspector.hh,v 1.2 2013/06/27 23:42:24 jeremy Exp $
#ifndef LCDD_STOREINSPECTOR_HH
#define LCDD_STOREINSPECTOR_HH 1
@@ -130,8 +130,8 @@
printObject(os, getObjectName(it), getObject(it));
os << "-------------------------------------" << endl;
}
- return os;
os << "*************************************" << endl << endl;
+ return os;
}
/**
CVSspam 0.2.12