diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
index b89b976a21304e2bf8dd4fdd73496f7f4ea9c160..f44e193a412b763e054f9fe2aa7adc7b2f402da3 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
@@ -152,8 +152,8 @@ const DOMElement *element;
//-------------------------------------------------------------------------------------------
//
// Turn var printout on and off with message level
- msglog << MSG::DEBUG << "\n\nGmx2Geo GmxUtil matrix, vector and var values:\n";
- msglog << MSG::DEBUG << "==============================================\n\n";
+ //msglog << MSG::DEBUG << "\n\nGmx2Geo GmxUtil matrix, vector and var values:\n";
+ //msglog << MSG::DEBUG << "==============================================\n\n";
XMLCh * defines_tmp = XMLString::transcode("defines");
XMLCh * vector_tmp = XMLString::transcode("vector");
@@ -173,7 +173,7 @@ const DOMElement *element;
//
// Vectors: a list of variables. Names subscripted by _k; values white-space separated numbers.
//
- msglog << "\n\n Vectors\n =======\n\n";
+ //msglog << "\n\n Vectors\n =======\n\n";
vars = element->getElementsByTagName(vector_tmp);
nVars = vars->getLength();
@@ -188,7 +188,7 @@ const DOMElement *element;
int k = 0;
do {
list >> dble;
- msglog << fullname + to_string(k) << " = " << dble << endl;
+ //msglog << fullname + to_string(k) << " = " << dble << endl;
eval.setVariable((fullname + to_string(k++)).c_str(), dble);
} while(list.good());
XMLString::release(&name);
@@ -197,7 +197,7 @@ const DOMElement *element;
//
// Matrices: a matrix of variables. Names subscripted by _j_k; values: white-space separated numbers.
//
- msglog << "\n\n Matrices\n ========\n\n";
+ //msglog << "\n\n Matrices\n ========\n\n";
vars = element->getElementsByTagName(matrix_tmp);
nVars = vars->getLength();
@@ -215,7 +215,7 @@ const DOMElement *element;
do {
for (int col = 0; col < coldim; ++col) {
list >> dble;
- msglog << fullname + to_string(k) + '_' + to_string(col) << " = " << dble << endl;
+ //msglog << fullname + to_string(k) + '_' + to_string(col) << " = " << dble << endl;
eval.setVariable((fullname + to_string(k) + '_' + to_string(col)).c_str(), dble);
if (!list.good()) break;
}
@@ -227,7 +227,7 @@ const DOMElement *element;
//
// Vars: single variable
//
- msglog << "\n\n Single variables\n ================\n\n";
+ //msglog << "\n\n Single variables\n ================\n\n";
vars = element->getElementsByTagName(var_tmp);
nVars = vars->getLength();
@@ -246,7 +246,7 @@ const DOMElement *element;
std::abort();
}
eval.setVariable(name, evaluated);
- msglog << name << "\t\t" << val << " = " << setprecision(10) << evaluated << endl;
+ //msglog << name << "\t\t" << val << " = " << setprecision(10) << evaluated << endl;
XMLString::release(&name);
XMLString::release(&val);
}
@@ -260,7 +260,7 @@ const DOMElement *element;
XMLString::release(&matrix_tmp);
XMLString::release(&coldim_tmp);
- msglog << endmsg;
+ //msglog << endmsg;
return 1;
}
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx
index 48f63a19e68399338c03aa529d5bc2bfe3107724..558e9bd04d991e433eaac380f8cae944b24f4b59 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx
@@ -83,7 +83,6 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
gmxUtil.positionIndex.addToLevelMap(name,gmxUtil.positionIndex.level());
XMLString::release(&name2release);
XMLString::release(&name_tmp);
- std::cout << "LogVol name: " << name << std::endl;
// get the value for the "named" option;
// if "true", add a GeoNameTag to the GeoModel tree
@@ -197,7 +196,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
XMLString::release(&materials_tmp);
}
else { // Already in the registry; use it.
- msglog << MSG::DEBUG << "LogVol w/ name '" << name << "' already present, picking it from cache..." << endmsg;
+ //msglog << MSG::DEBUG << "LogVol w/ name '" << name << "' already present, picking it from cache..." << endmsg;
if(isNamed) {
nameTag_physVolName = entry->second.name;
}
@@ -216,7 +215,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
name2release = XMLString::transcode(el->getNodeName());
string name(name2release);
XMLString::release(&name2release);
- msglog << MSG::DEBUG << "Processing child: '" << name << "'..." << endmsg;
+ //msglog << MSG::DEBUG << "Processing child: '" << name << "'..." << endmsg;
gmxUtil.processorRegistry.find(name)->process(el, gmxUtil, childrenAdd);
}
}
@@ -262,7 +261,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
if (sensitive || (alignable.compare(string("true")) == 0)) {
- msglog << MSG::DEBUG << "Handling a FullPhysVol (i.e., an 'alignable' or 'sensitive' volume) ..." << endmsg;
+ //msglog << MSG::DEBUG << "Handling a FullPhysVol (i.e., an 'alignable' or 'sensitive' volume) ..." << endmsg;
GeoFullPhysVol *pv = new GeoFullPhysVol(lv);
if (is_envelope) GeoVolumeTagCatalog::VolumeTagCatalog()->addTaggedVolume("Envelope",name,pv);
for (GeoNodeList::iterator node = childrenAdd.begin(); node != childrenAdd.end(); ++node) {
@@ -298,15 +297,15 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
}
}
else {
- msglog << MSG::DEBUG << "Handling a standard PhysVol..." << endmsg;
+ //msglog << MSG::DEBUG << "Handling a standard PhysVol..." << endmsg;
GeoPhysVol *pv = new GeoPhysVol(lv);
if (is_envelope) GeoVolumeTagCatalog::VolumeTagCatalog()->addTaggedVolume("Envelope",name,pv);
- msglog << MSG::DEBUG << "Now, looping over all the children of the LogVol (in the GMX meaning)..." << endmsg;
+ //msglog << MSG::DEBUG << "Now, looping over all the children of the LogVol (in the GMX meaning)..." << endmsg;
for (GeoNodeList::iterator node = childrenAdd.begin(); node != childrenAdd.end(); ++node) {
pv->add(*node);
- msglog << MSG::DEBUG << "LVProc, PV child: " << *node << " -- " << getNodeType(*node) << endmsg;
+ //msglog << MSG::DEBUG << "LVProc, PV child: " << *node << " -- " << getNodeType(*node) << endmsg;
}
- msglog << MSG::DEBUG << "End of loop over children." << endmsg;
+ //msglog << MSG::DEBUG << "End of loop over children." << endmsg;
toAdd.push_back(pv);
}
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolrefProcessor.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolrefProcessor.cxx
index 667622799d27848ea7860ba86e2dfff52073d8fa..299917461784f69cac2d90ee595fc0c2b0c62c65 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolrefProcessor.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolrefProcessor.cxx
@@ -47,7 +47,7 @@ char *toRelease;
gmxUtil.tagHandler.logvol.zeroId(elem);
}
- msglog << MSG::DEBUG << "\n\nLogvolrefProcessor -- Calling the processor for the LogVol element..." << endmsg;
+ //msglog << MSG::DEBUG << "\n\nLogvolrefProcessor -- Calling the processor for the LogVol element..." << endmsg;
gmxUtil.tagHandler.logvol.process(elem, gmxUtil, toAdd);
XMLString::release(&ref);
XMLString::release(&zeroid_tmp);