Skip to content
Snippets Groups Projects
Commit 995c088f authored by Nicholas Styles's avatar Nicholas Styles Committed by Joseph Boudreau
Browse files

Comment very verbose log messages until better steering is available

parent 9abd3067
No related branches found
No related tags found
1 merge request!151Comment very verbose log messages until better steering is available
...@@ -152,8 +152,8 @@ const DOMElement *element; ...@@ -152,8 +152,8 @@ const DOMElement *element;
//------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------
// //
// Turn var printout on and off with message level // 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\nGmx2Geo GmxUtil matrix, vector and var values:\n";
msglog << MSG::DEBUG << "==============================================\n\n"; //msglog << MSG::DEBUG << "==============================================\n\n";
XMLCh * defines_tmp = XMLString::transcode("defines"); XMLCh * defines_tmp = XMLString::transcode("defines");
XMLCh * vector_tmp = XMLString::transcode("vector"); XMLCh * vector_tmp = XMLString::transcode("vector");
...@@ -173,7 +173,7 @@ const DOMElement *element; ...@@ -173,7 +173,7 @@ const DOMElement *element;
// //
// Vectors: a list of variables. Names subscripted by _k; values white-space separated numbers. // 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); vars = element->getElementsByTagName(vector_tmp);
nVars = vars->getLength(); nVars = vars->getLength();
...@@ -188,7 +188,7 @@ const DOMElement *element; ...@@ -188,7 +188,7 @@ const DOMElement *element;
int k = 0; int k = 0;
do { do {
list >> dble; 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); eval.setVariable((fullname + to_string(k++)).c_str(), dble);
} while(list.good()); } while(list.good());
XMLString::release(&name); XMLString::release(&name);
...@@ -197,7 +197,7 @@ const DOMElement *element; ...@@ -197,7 +197,7 @@ const DOMElement *element;
// //
// Matrices: a matrix of variables. Names subscripted by _j_k; values: white-space separated numbers. // 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); vars = element->getElementsByTagName(matrix_tmp);
nVars = vars->getLength(); nVars = vars->getLength();
...@@ -215,7 +215,7 @@ const DOMElement *element; ...@@ -215,7 +215,7 @@ const DOMElement *element;
do { do {
for (int col = 0; col < coldim; ++col) { for (int col = 0; col < coldim; ++col) {
list >> dble; 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); eval.setVariable((fullname + to_string(k) + '_' + to_string(col)).c_str(), dble);
if (!list.good()) break; if (!list.good()) break;
} }
...@@ -227,7 +227,7 @@ const DOMElement *element; ...@@ -227,7 +227,7 @@ const DOMElement *element;
// //
// Vars: single variable // Vars: single variable
// //
msglog << "\n\n Single variables\n ================\n\n"; //msglog << "\n\n Single variables\n ================\n\n";
vars = element->getElementsByTagName(var_tmp); vars = element->getElementsByTagName(var_tmp);
nVars = vars->getLength(); nVars = vars->getLength();
...@@ -246,7 +246,7 @@ const DOMElement *element; ...@@ -246,7 +246,7 @@ const DOMElement *element;
std::abort(); std::abort();
} }
eval.setVariable(name, evaluated); 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(&name);
XMLString::release(&val); XMLString::release(&val);
} }
...@@ -260,7 +260,7 @@ const DOMElement *element; ...@@ -260,7 +260,7 @@ const DOMElement *element;
XMLString::release(&matrix_tmp); XMLString::release(&matrix_tmp);
XMLString::release(&coldim_tmp); XMLString::release(&coldim_tmp);
msglog << endmsg; //msglog << endmsg;
return 1; return 1;
} }
......
...@@ -83,7 +83,6 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo ...@@ -83,7 +83,6 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
gmxUtil.positionIndex.addToLevelMap(name,gmxUtil.positionIndex.level()); gmxUtil.positionIndex.addToLevelMap(name,gmxUtil.positionIndex.level());
XMLString::release(&name2release); XMLString::release(&name2release);
XMLString::release(&name_tmp); XMLString::release(&name_tmp);
std::cout << "LogVol name: " << name << std::endl;
// get the value for the "named" option; // get the value for the "named" option;
// if "true", add a GeoNameTag to the GeoModel tree // if "true", add a GeoNameTag to the GeoModel tree
...@@ -197,7 +196,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo ...@@ -197,7 +196,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
XMLString::release(&materials_tmp); XMLString::release(&materials_tmp);
} }
else { // Already in the registry; use it. 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) { if(isNamed) {
nameTag_physVolName = entry->second.name; nameTag_physVolName = entry->second.name;
} }
...@@ -216,7 +215,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo ...@@ -216,7 +215,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
name2release = XMLString::transcode(el->getNodeName()); name2release = XMLString::transcode(el->getNodeName());
string name(name2release); string name(name2release);
XMLString::release(&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); gmxUtil.processorRegistry.find(name)->process(el, gmxUtil, childrenAdd);
} }
} }
...@@ -262,7 +261,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo ...@@ -262,7 +261,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
if (sensitive || (alignable.compare(string("true")) == 0)) { 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); GeoFullPhysVol *pv = new GeoFullPhysVol(lv);
if (is_envelope) GeoVolumeTagCatalog::VolumeTagCatalog()->addTaggedVolume("Envelope",name,pv); if (is_envelope) GeoVolumeTagCatalog::VolumeTagCatalog()->addTaggedVolume("Envelope",name,pv);
for (GeoNodeList::iterator node = childrenAdd.begin(); node != childrenAdd.end(); ++node) { for (GeoNodeList::iterator node = childrenAdd.begin(); node != childrenAdd.end(); ++node) {
...@@ -298,15 +297,15 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo ...@@ -298,15 +297,15 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
} }
} }
else { else {
msglog << MSG::DEBUG << "Handling a standard PhysVol..." << endmsg; //msglog << MSG::DEBUG << "Handling a standard PhysVol..." << endmsg;
GeoPhysVol *pv = new GeoPhysVol(lv); GeoPhysVol *pv = new GeoPhysVol(lv);
if (is_envelope) GeoVolumeTagCatalog::VolumeTagCatalog()->addTaggedVolume("Envelope",name,pv); 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) { for (GeoNodeList::iterator node = childrenAdd.begin(); node != childrenAdd.end(); ++node) {
pv->add(*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); toAdd.push_back(pv);
} }
......
...@@ -47,7 +47,7 @@ char *toRelease; ...@@ -47,7 +47,7 @@ char *toRelease;
gmxUtil.tagHandler.logvol.zeroId(elem); 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); gmxUtil.tagHandler.logvol.process(elem, gmxUtil, toAdd);
XMLString::release(&ref); XMLString::release(&ref);
XMLString::release(&zeroid_tmp); XMLString::release(&zeroid_tmp);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment