virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs) { // std::cout << "FieldMapTypeProcess::StartElement - " << name << std::endl; FieldTypeProcess::StartElement(name, attrs); }

+ /** + * Execute UI command. + * @param[in] cmd The command to execute. + * @param[in] newVals The command arguments. + */ + void SetNewValue(G4UIcommand* cmd, G4String newVals);

lcdd/include/lcdd/util

StoreInspector.hh 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- StoreInspector.hh	1 Jul 2013 22:10:34 -0000	1.4
+++ StoreInspector.hh	3 Jul 2013 23:33:51 -0000	1.5
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/lcdd/util/StoreInspector.hh,v 1.4 2013/07/01 22:10:34 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/lcdd/util/StoreInspector.hh,v 1.5 2013/07/03 23:33:51 jeremy Exp $

 
 #ifndef LCDD_UTIL_STOREINSPECTOR_HH
 #define LCDD_UTIL_STOREINSPECTOR_HH 1

@@ -55,7 +55,9 @@

 
 public:

-    /** ctor */

+    /**
+     * Class constructor.
+     */

     StoreInspector(const std::string& name, const ObjectContainer* container) :
             G4UImessenger()
     {

@@ -65,7 +67,12 @@

         defineCommands();
     }

-    /* Overloaded find for vector. */

+    /**
+     * Find an object by name in the list.
+     * @param[in] name   The name of the object.
+     * @param[in] objVec The list of objects.
+     * @return The object with name or 0 if doesn't exist.
+     */

     Object* findByName(const std::string& name, const std::vector<Object*>* objVec)
     {
         Object* obj = 0;

@@ -78,51 +85,83 @@

         return obj;
     }

-    /* Overloaded find for map. */

+    /*
+     * Find an object by name in a map.
+     * @param[in] name   The name of the object.
+     * @param[in] objMap The object map.
+     * @return The object with name or 0 if doesn't exist.
+     */

     Object* findByName(const std::string& name, const std::map<std::string, Object*>* objMap)
     {
         std::map<std::string, Object*>* objMap_nconst = const_cast<std::map<std::string, Object*>*>(objMap);
         return (*objMap_nconst)[name];
     }

-    /* Simple name comparison returning true if the strings match. */

+    /**
+     * Compare an object name.
+     * @param[in] obj  The object.
+     * @param[in] name The name to compare.
+     * @return True if names are the same; false if not.
+     */

     bool sameName(Object* obj, const std::string& name)
     {
         return (((std::string) obj->GetName()) == name);
     }

-    /* Find an object by name. */

+    /**
+     * Find an object by name.
+     * @param[in] name The object name.
+     * @return The object with name or 0 if doesn't exist.
+     */

     Object* find(const std::string& name)
     {
         return findByName(name, const_cast<const ObjectContainer*>(_container));
     }

-    /* Object from iterator for maps. */

+    /**
+     * Get an object from a map iterator.
+     * @param[in] it The map iterator.
+     * @return The object from the iterator.
+     */

     Object* getObject(typename std::map<std::string, Object*>::const_iterator it)
     {
         return it->second;
     }

-    /* Object from iterator for vectors. */

+    /**
+     * Get an object from a vector iterator.
+     * @param[in] it The vector iterator.
+     * @return The object from the iterator.
+     */

     Object* getObject(typename std::vector<Object*>::const_iterator it)
     {
         return (*it);
     }

-    /* Name from iterator for maps. */

+    /**
+     * Get the name of the object from a map iterator.
+     * @param[in] it The map iterator.
+     * @return The name of the object from the iterator.
+     */

     const std::string& getObjectName(typename std::map<std::string, Object*>::const_iterator it)
     {
         return it->first;
     }

-    /* Name from iterator for vectors. */

+    /**
+     * Get the name of an object from a vector iterator.
+     * @param[in] it The vector iterator.
+     * @return The object name.
+     */

     const std::string& getObjectName(typename std::vector<Object*>::const_iterator it)
     {
         return (*it)->GetName();
     }
 
     /**

-     * Print out the objects in the store using the stream.

+     * Print the objects in the store to an output stream.
+     * @param[in] os An output stream.
+     * @return The same output stream.

      */
     std::ostream& printStore(std::ostream& os)
     {

@@ -137,6 +176,9 @@

 
     /**
      * Print a single object's name and data using the stream operator.

+     * @param[in] os     An output stream.
+     * @param[in] name   The name of the object.
+     * @param[in] object The object to print.

      */
     std::ostream& printObject(std::ostream& os, const std::string& name, Object* obj)
     {

@@ -145,7 +187,9 @@

         return os;
     }

-    /* Defines G4UIcommand to be used with this inspector. */

+    /**
+     * Define commands to be used with this inspector.
+     */

     void defineCommands()
     {
         _dir = new G4UIdirectory(std::string("/stores/" + _name + "/").c_str());

@@ -159,9 +203,11 @@

     }
 
     /**

-     * Hook for the G4UIcommand 'print' on this inspector.

+     * Execute Geant4 UI command on this inspector using its messenger.
+     * @param[in] cmd     The UI command.
+     * @param[in] newVals The command arguments.

*/

-    virtual void SetNewValue(G4UIcommand*, G4String newVals)

+    virtual void SetNewValue(G4UIcommand* cmd, G4String newVals)

     {
         std::string name = (std::string) newVals;
         if (name != std::string("")) {

@@ -184,7 +230,7 @@

 };
 
 /**

- * Declarations of specific types of object store inspectors.

+ * Following are declarations of specific types of object store inspectors:

  */
 typedef StoreInspector<G4Material, G4MaterialTable> G4MaterialStoreInspector;
 typedef StoreInspector<G4VSolid, G4SolidStore> G4SolidStoreInspector;

@@ -198,6 +244,12 @@

 typedef StoreInspector<SensitiveDetector, LCDDProcessor::SensitiveDetectors> G4SensitiveDetectorInspector;
 typedef StoreInspector<G4MagneticField, LCDDProcessor::MagneticFields> G4MagneticFieldInspector;

+/**
+ * Overloaded print operator for PhysicsLimitSet.
+ * @param[in] os     An output stream.
+ * @param[in] limset The PhysicsLimitSet to print.
+ * @return The same output stream.
+ */

 std::ostream& operator<<(std::ostream& os, PhysicsLimitSet& limset)
 {
     os << endl;

@@ -232,16 +284,17 @@

     return os;
 }

-/* G4LogicalVolume stream operator */

+/**
+ * Overloaded stream operator for G4LogicalVolume.
+ * @param[in] os An output stream.
+ * @param[in] lv The volume to print.
+ * @return The same output stream.
+ */

 std::ostream& operator<<(std::ostream &os, G4LogicalVolume &lv)
 {
     os << "solid: " << lv.GetSolid()->GetName() << endl;
     os << "material: " << lv.GetMaterial()->GetName() << endl;

-
-#ifdef HAVE_G4LOGICALVOLUME_GETMASS

     os << "mass: " << G4BestUnit(lv.GetMass(), "Mass") << endl;

-#endif
-

     os << "daughters: " << lv.GetNoDaughters() << endl;
 
     G4UserLimits* lim = lv.GetUserLimits();

@@ -283,6 +336,12 @@

     return os;
 }

+/**
+ * Overloaded print stream operator for G4VPhysicalVolume class.
+ * @param[in] os An output stream.
+ * @param[in] pv The volume to print.
+ * @return The same output stream.
+ */

 std::ostream& operator<<(std::ostream &os, G4VPhysicalVolume &pv)
 {
     os << "lvolume: " << pv.GetLogicalVolume()->GetName() << endl;

@@ -298,7 +357,12 @@

     os << "# copies: " << pv.GetMultiplicity() << endl;
     return os;
 }

+/**
+ * Overloaded print stream operator for IdSpec class.
+ * @param[in] os An output stream.
+ * @param[in] id The IdSpec to print.
+ * @return The same output stream.
+ */

 std::ostream& operator<<(std::ostream& os, IdSpec& id)
 {
     os << "# fields: " << id.getNumFields() << endl;

@@ -311,6 +375,12 @@

     return os;
 }

+/**
+ * Overloaded print stream operator for SensitiveDetector class.
+ * @param[in] os An output stream.
+ * @param[in] sd The SensitiveDetector to print.
+ * @return The same output stream.
+ */

 std::ostream& operator<<(std::ostream& os, SensitiveDetector& sd)
 {
     os << "fullPath: " << sd.GetFullPathName() << endl;

@@ -324,7 +394,12 @@

     return os;
 }

-/* G4Region stream operator */

+/**
+ * Overloaded print stream operator for G4Region class.
+ * @param[in] os  An output stream.
+ * @param[in] reg The region to print.
+ * @return The same output stream.
+ */

 std::ostream& operator<<(std::ostream &os, G4Region &reg)
 {
     os << "prod cut: " << reg.GetProductionCuts()->GetProductionCut(0) << endl;

@@ -338,13 +413,24 @@

     return os;
 }

-std::ostream& operator<<(std::ostream& os, G4MagneticField&)

+/**
+ * Overloaded print stream operator for G4MagneticField class.
+ * @param[in] os An output stream.
+ * @param[in] f  The field to print.
+ * @return The same output stream.
+ */
+std::ostream& operator<<(std::ostream& os, G4MagneticField& f)

 {
     /* Generic B-fields have no displayable data attributes! */
     return os;
 }

-/* G4VisAttributes stream operator */

+/**
+ * Overloaded print stream operator for G4VisAttribute objects.
+ * @param[in] os  An output stream.
+ * @param[in] vis The G4VisAttributes to print.
+ * @return The same output stream.
+ */

 std::ostream& operator<<(std::ostream& os, G4VisAttributes &vis)
 {
     const G4Color& color = vis.GetColor();

+ /** + * Convert string to all lower case. + * @param[in] s The string to be converted. + * @return The string converted to all lower case. + */ + static std::string& toLower(std::string& s); + + /** + * Convert string to all lower case, const version. + * @param[in] s The string to be converted. + * @return The string converted to all lower case. + */ + static std::string& toLower(const std::string& s); + + /** + * Convert string to double value. + * @param[in] s The string to be converted. + * @return The converted double value. + */

- static std::string concatStrVec(const std::vector<std::string>& s_vec, const std::string& sep = " "); - - static void split(const std::string& str, const std::string& delimiters, std::vector<std::string>& tokens);

+ /** + * Concatenate a vector of strings into one string, separated by sep character. + * @param[in] strings The vector of strings. + * @param[in] sep The separator between elements. + */ + static std::string concatStrVec(const std::vector<std::string>& strings, const std::string& sep = " "); + + /** + * Split a string into tokens based on list of delimiters. + * @param[in] str The string to be split. + * @param[in] delimiters The list of single character delimiters. + * @param[out] tokens The output list of string tokens. + */ + static void split(const std::string& str, + const std::string& delimiters, + std::vector<std::string>& tokens);

Commit in `lcdd` on MAIN
`include/lcdd/processes/FieldMapTypeProcess.hh`	+24	-3	1.2 -> 1.3
`/FieldTypeProcess.hh`	+26	-4	1.2 -> 1.3
`/SensitiveDetectorTypeProcess.hh`	+27	-5	1.2 -> 1.3
`/calorimeterProcess.hh`	+22	-1	1.2 -> 1.3
`include/lcdd/schema/author.hh`	+2	-3	1.2 -> 1.3
`include/lcdd/util/GDMLWriter.hh`	+18	-2	1.3 -> 1.4
`/GDMLWriterMessenger.hh`	+20	-4	1.2 -> 1.3
`/NistElementsDump.hh`	+18	-2	1.3 -> 1.4
`/StoreInspector.hh`	+110	-24	1.4 -> 1.5
`/StringUtil.hh`	+91	-10	1.3 -> 1.4
`/Verbose.hh`	+25	-9	1.2 -> 1.3
`src/lcdd/processes/box_dipoleProcess.cc`	+2	-2	1.2 -> 1.3
`/calorimeterProcess.cc`	+2	-2	1.1 -> 1.2
`/field_map_3dProcess.cc`	+2	-2	1.2 -> 1.3
`/rz_field_mapProcess.cc`	+2	-2	1.1 -> 1.2
`/scorerProcess.cc`	+2	-2	1.1 -> 1.2
`/solenoidProcess.cc`	+2	-2	1.1 -> 1.2
`/trackerProcess.cc`	+2	-2	1.1 -> 1.2
`src/lcdd/util/GDMLWriterMessenger.cc`	+6	-6	1.1 -> 1.2
`/Verbose.cc`	+2	-2	1.1 -> 1.2
	+405	-89