Merge branch 'debugOutputCNL' into 'master'

Add debug output for GeoModelXml copy number levels

See merge request !122

GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx

@@ -102,6 +102,8 @@ void GMXPlugin::create(GeoPhysVol *world, bool publish)
 	std::cout<<"matman set to "<<matman<<std::endl;
   }
 
+  char* levelmaps=getenv("GMX_DUMP_LEVEL_MAPS");
+
   for (auto f: filesToParse)
   {
     if (!exists(f)) {
@@ -110,7 +112,13 @@ void GMXPlugin::create(GeoPhysVol *world, bool publish)
    	return;
     }
     GmxInterface gmxInterface;
-    Gmx2Geo gmx2Geo(f, world, gmxInterface, 0 , matman);
+    if (levelmaps!=nullptr){
+        std::string mapname = f.substr(0, f.length() - 4);
+        mapname+="_levelMap.txt";
+        std::cout<<"Dumping Copy Number Level Map to "<<mapname<<std::endl;
+        Gmx2Geo gmx2Geo(f, world, gmxInterface, 0 , matman, mapname);
+    }
+    else Gmx2Geo gmx2Geo(f, world, gmxInterface, 0 , matman);
   }
 
   if (matman) MaterialManager::getManager()->printAll();

GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h

@@ -58,14 +58,14 @@ class IEvaluator;
 
 class Gmx2Geo {
 public:
-    Gmx2Geo(const std::string& gmxFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags = 0, bool useMatManager = 0,const processorList& procs=processorList());
+    Gmx2Geo(const std::string& gmxFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags = 0, bool useMatManager = 0, std::string levelMapName = "", const processorList& procs=processorList());
 private:
 // Disallow copying
     Gmx2Geo(const Gmx2Geo &right);
     Gmx2Geo & operator=(const Gmx2Geo &right);
 
     int doDefines(xercesc::DOMDocument *doc, GeoModelTools::IEvaluator &eval);
-    int doPositionIndex(xercesc::DOMDocument *doc, GmxUtil &gmxUtil);
+    int doPositionIndex(xercesc::DOMDocument *doc, GmxUtil &gmxUtil, std::string levelMapName = "");
     int doReadoutGeometry(xercesc::DOMDocument *doc, GmxUtil &gmxUtil);
     void addParam(xercesc::DOMNode *node, std::map<std::string, std::string> &params);
 };

GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/PositionIndex.h

@@ -41,6 +41,11 @@ public:
 
     void indices(std::map<std::string, int> &index, GeoModelTools::IEvaluator &eval);
 
+    void addToLevelMap(std::string name, int level);
+    void printLevelMap();
+    void setLevelMapName(std::string filename);
+    std::string getLevelMapName();
+
 private:
     int m_level;
     std::vector <int> m_copyNo; // Size is always m_level+1
@@ -48,5 +53,7 @@ private:
  */
     std::vector <std::string> m_name;
     std::map <std::string, std::string> m_formula;
+    std::map <std::string, int> m_levelMap;
+    std::string m_mapName;
 };
 #endif // POSITIONINDEX_H

GeoModelTools/GeoModelXML/GeoModelXml/src/AssemblyProcessor.cxx

@@ -39,6 +39,7 @@ GeoNameTag *physVolName;
     XMLCh * name_tmp = XMLString::transcode("name");
     char *name2release = XMLString::transcode(element->getAttribute(name_tmp));
     string name(name2release);
+    gmxUtil.positionIndex.addToLevelMap(name,gmxUtil.positionIndex.level());
     XMLString::release(&name2release);
     XMLString::release(&name_tmp);
 //

GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx

@@ -31,7 +31,7 @@
 using namespace std;
 using namespace xercesc;
 
-Gmx2Geo::Gmx2Geo(const string& xmlFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags, bool useMatManager, const processorList& procs) {
+Gmx2Geo::Gmx2Geo(const string& xmlFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags, bool useMatManager, std::string levelMapName, const processorList& procs) {
 //
 //    Create the xml tree (DOMDocument)
 //
@@ -92,7 +92,7 @@ Gmx2Geo::Gmx2Geo(const string& xmlFile, GeoPhysVol *addHere, GmxInterface &gmxIn
 //
 //    Add all index names
 //
-    doPositionIndex(doc, gmxUtil);
+    doPositionIndex(doc, gmxUtil, levelMapName);
 //
 //   The xml file ends with an addbranch element. We start there, process it, 
 //   and it fills in the list of things to be added to the GeoModel graph. 
@@ -262,7 +262,7 @@ const DOMElement *element;
     return 1;
 }
 
-int Gmx2Geo::doPositionIndex(xercesc::DOMDocument *doc, GmxUtil &gmxUtil) {
+int Gmx2Geo::doPositionIndex(xercesc::DOMDocument *doc, GmxUtil &gmxUtil, std::string levelMapName) {
     XMLCh * positionindex_tmp = XMLString::transcode("positionindex");
     XMLCh * addindex_tmp = XMLString::transcode("addindex");
     XMLCh * name_tmp = XMLString::transcode("name");
@@ -277,6 +277,7 @@ int Gmx2Geo::doPositionIndex(xercesc::DOMDocument *doc, GmxUtil &gmxUtil) {
             DOMElement *addindex = dynamic_cast<DOMElement*>(addindexs->item(j));
             string name = string(XMLString::transcode(addindex->getAttribute(name_tmp)));
             gmxUtil.positionIndex.addIndex(name);
+            if(levelMapName!="") gmxUtil.positionIndex.setLevelMapName(levelMapName);
         }
     }
     XMLString::release(&positionindex_tmp);

GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx

@@ -41,6 +41,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
   XMLCh * name_tmp = XMLString::transcode("name");
   char *name2release = XMLString::transcode(element->getAttribute(name_tmp));
   string name(name2release);
+  gmxUtil.positionIndex.addToLevelMap(name,gmxUtil.positionIndex.level());
   XMLString::release(&name2release);
   XMLString::release(&name_tmp);
 
@@ -229,6 +230,9 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
   }
 
   gmxUtil.positionIndex.decrementLevel();
+  if(gmxUtil.positionIndex.level()==-1){ //should mean that we are at the end of processing the geometry
+    gmxUtil.positionIndex.printLevelMap();
+  }
   return;
 }
 

GeoModelTools/GeoModelXML/GeoModelXml/src/PositionIndex.cxx

@@ -6,6 +6,7 @@
 #include "OutputDirector.h"
 #include <vector>
 #include <string>
+#include <fstream>
 #include "ExpressionEvaluator/IEvaluator.h"
 #include "GeoModelXml/PositionIndex.h"
 
@@ -13,6 +14,8 @@ using namespace std;
 
 PositionIndex::PositionIndex() {
     m_level = -1; // Level -1 represents the "world" with no Copy Number
+    m_levelMap.clear();
+    m_mapName = "";
 }
 
 PositionIndex::~PositionIndex() {}
@@ -112,3 +115,31 @@ void PositionIndex::indices(map<string, int> &index, GeoModelTools::IEvaluator &
         eval.setVariable(name.c_str(), (double) index[name]);
     }
 }
+
+ void PositionIndex::addToLevelMap(std::string name,int level){
+     m_levelMap[name]=level;
+ }
+
+void PositionIndex::setLevelMapName(std::string name){
+    m_mapName = name;
+}
+
+std::string PositionIndex::getLevelMapName(){
+    return m_mapName;
+}
+
+void PositionIndex::printLevelMap(){
+if(m_mapName!=""){
+    std::ofstream outfile(m_mapName);
+    outfile<<"----------CNL Map----------\n\n";
+    for (auto const& entry: m_levelMap){
+        outfile<<"Item: "<<entry.first<<"   Level: CNL_"<<entry.second<<"   last copyNumber at Level:"<<m_copyNo[entry.second]<<"\n";
+    }
+    outfile<<"\n\n";
+    outfile.close();
+}
+//otherwise, do nothing
+}
+
+
+