From 6914ca1d0bb2bae34cb40b8cbcbcb0c48ef366fb Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Tue, 7 Jun 2022 12:35:12 +0200
Subject: [PATCH] Add package name to warning/error messages
---
.../GeoModelWrite/src/WriteGeoModel.cpp | 36 ++++++++++---------
GeoModelTools/GMCAT/src/gmcat.cxx | 17 +++++----
2 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp b/GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp
index a35ede516..1341cce94 100644
--- a/GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp
+++ b/GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
// author: Riccardo.Maria.Bianchi@cern.ch, 2017
@@ -148,6 +148,8 @@ void WriteGeoModel::handleFullPhysVol (const GeoFullPhysVol *vol)
void WriteGeoModel::handleVPhysVolObjects(const GeoVPhysVol* vol)
{
+ //std::cout << "WriteGeoModel::handleVPhysVolObjects() -- visiting... " << vol << std::endl; // debug msg
+
// get the address string for the current volume
std::string address = getAddressStringFromPointer( vol );
@@ -270,7 +272,7 @@ void WriteGeoModel::handleVPhysVolObjects(const GeoVPhysVol* vol)
// LOGVOL
const GeoLogVol* logVol = vol->getLogVol();
- const std::string logName = logVol->getName();
+ const std::string logName = logVol->getName();
// MATERIAL
const GeoMaterial * mat = vol->getLogVol()->getMaterial();
@@ -300,27 +302,29 @@ void WriteGeoModel::handleVPhysVolObjects(const GeoVPhysVol* vol)
const GeoPhysVol* physVol = dynamic_cast<const GeoPhysVol*>(vol);
// store the PhysVol volume into the DB
physId = storeObj(physVol, logvolId, parentId, storeRootVolume); // with parent info
- volTypeStr = "GeoPhysVol";
+ volTypeStr = "GeoPhysVol";
}
else if (dynamic_cast<const GeoFullPhysVol*>(vol)) {
const GeoFullPhysVol* fullVol = dynamic_cast<const GeoFullPhysVol*>(vol);
physId = storeObj(fullVol, logvolId, parentId, storeRootVolume); // with parent info
- volTypeStr = "GeoFullPhysVol";
+ volTypeStr = "GeoFullPhysVol";
} else {
- std::cout << "WARNING!! Unknown GeoVPhysVol type!! Exiting..." << std::endl;
- exit(EXIT_FAILURE);
+ std::cout << "GeoModelWrite -- WARNING!! Unknown GeoVPhysVol type!! Exiting..." << std::endl;
+ exit(EXIT_FAILURE);
}
} else {
physId = getStoredIdFromAddress(address);
- volTypeStr = getGeoTypeFromVPhysVol(vol);
+ volTypeStr = getGeoTypeFromVPhysVol(vol);
}
// Now we get the 'copy number' for this volume,
// to distinguish this volume from the other volumes created from the same shared node (if any)
- if (volTypeStr == "NULL") std::cout << "ERROR!! volTypeStr is 'NULL'!!!\n";
+ if (volTypeStr == "NULL") std::cout << "ERROR!! volTypeStr is 'NULL'!!!\n";
const unsigned int volCopyN = setVolumeCopyNumber(physId, volTypeStr);
- //JFB Commented out: qDebug() << "physId: " << physId << "- volume copy number: " << volCopyN;
+
+ // debug msg
+ //std::cout << "WriteGeoModel -- physId: " << physId << "- volume copy number: " << volCopyN << std::endl;
if ( isRootVolume || parentId == 0) {
//qDebug() << "This is the RootVolume or the volume has 'NULL' parent (unconnected subtree?) - So, we do not store the child position for this volume!";
@@ -347,7 +351,7 @@ void WriteGeoModel::handleVPhysVolObjects(const GeoVPhysVol* vol)
else if (dynamic_cast<const GeoFullPhysVol*>(vol)) {
geoType = "GeoFullPhysVol";
} else {
- std::cout << "WARNING!! Unknown GeoVPhysVol type!!" << std::endl;
+ std::cout << "GeoModelWrite -- WARNING!! Unknown GeoVPhysVol type!!" << std::endl;
}
return geoType;
}
@@ -498,7 +502,7 @@ void WriteGeoModel::handleSerialTransformer (const GeoSerialTransformer *node)
try {
persistifier.persistify(*func);
} catch (const std::runtime_error & error) {
- std::cout << "SEVERE WARNING!! Handling std::runtime_error! -->" << error.what() << std::endl;
+ std::cout << "GeoModelWrite -- SEVERE WARNING!! Handling std::runtime_error! -->" << error.what() << std::endl;
}
std::string expression = persistifier.getCodedString();
@@ -652,7 +656,7 @@ void WriteGeoModel::handleNameTag(const GeoNameTag* node)
}
}
else{
- std::cout << "WARNING!! Len == 0, but this cannot be the Root volume!" << std::endl;
+ std::cout << "GeoModelWrite -- WARNING!! Len == 0, but this cannot be the Root volume!" << std::endl;
}
std::vector<std::string> parentList;
@@ -1124,7 +1128,7 @@ std::string WriteGeoModel::getShapeParameters(const GeoShape* shape)
// shapePars=pars.join(";");
// }
else {
- std::cout << "\n\tWARNING!!! - Shape '" << shapeType << "' needs to be persistified!!\n\n";
+ std::cout << "\n\tGeoModelWrite -- WARNING!!! - Shape '" << shapeType << "' needs to be persistified!!\n\n";
printStdVectorStrings(m_objectsNotPersistified);
}
@@ -1702,7 +1706,7 @@ void WriteGeoModel::saveToDB( std::vector<GeoPublisher*>& publishers )
if ( !m_objectsNotPersistified.empty() ) {
- std::cout << "\n\tWARNING!! There are shapes/nodes which need to be persistified! --> ";
+ std::cout << "\n\tGeoModelWrite -- WARNING!! There are shapes/nodes which need to be persistified! --> ";
printStdVectorStrings(m_objectsNotPersistified);
std::cout << "\n\n";
}
@@ -1741,12 +1745,12 @@ void WriteGeoModel::storePublishedNodes(GeoPublisher* store)
if (mapAXF.size() > 0) {
m_dbManager->addListOfPublishedAlignableTransforms(m_publishedAlignableTransforms_String, storeName);
} else {
- std::cout << "\nWARNING! A pointer to a GeoPublisher was provided, but no GeoAlignableTransform nodes have been published. Please, check if that was intended. (If in doubt, please ask to 'geomodel-developers@cern.ch')\n" << std::endl;
+ std::cout << "\nGeoModelWrite -- WARNING! A pointer to a GeoPublisher was provided, but no GeoAlignableTransform nodes have been published. Please, check if that was intended. (If in doubt, please ask to 'geomodel-developers@cern.ch')\n" << std::endl;
}
if (mapFPV.size() > 0) {
m_dbManager->addListOfPublishedFullPhysVols(m_publishedFullPhysVols_String, storeName);
} else {
- std::cout << "\nWARNING! A pointer to a GeoPublisher was provided, but no GeoFullPhysVol nodes have been published. Please, check if that was intended. (If in doubt, please ask to 'geomodel-developers@cern.ch')\n" << std::endl;
+ std::cout << "\nGeoModelWrite -- WARNING! A pointer to a GeoPublisher was provided, but no GeoFullPhysVol nodes have been published. Please, check if that was intended. (If in doubt, please ask to 'geomodel-developers@cern.ch')\n" << std::endl;
}
// clear the caches
diff --git a/GeoModelTools/GMCAT/src/gmcat.cxx b/GeoModelTools/GMCAT/src/gmcat.cxx
index b0296f46c..c486d4ab2 100644
--- a/GeoModelTools/GMCAT/src/gmcat.cxx
+++ b/GeoModelTools/GMCAT/src/gmcat.cxx
@@ -1,3 +1,7 @@
+/*
+ * Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+*/
+
#include "GeoModelKernel/GeoVGeometryPlugin.h"
#include "GeoModelDBManager/GMDBManager.h"
#include "GeoModelRead/ReadGeoModel.h"
@@ -84,12 +88,12 @@ int main(int argc, char ** argv) {
if (access(outputFile.c_str(),F_OK)==0) {
if (!access(outputFile.c_str(),W_OK)) {
if (system(("rm -f "+ outputFile).c_str())) {
- std::cerr << "Error, cannot overwrite existing file " << outputFile << std::endl;
+ std::cerr << "gmcat -- Error, cannot overwrite existing file " << outputFile << std::endl;
return 3;
}
}
else {
- std::cerr << "Error, cannot overwrite existing file " << outputFile << " (permission denied)" << std::endl;
+ std::cerr << "gmcat -- Error, cannot overwrite existing file " << outputFile << " (permission denied)" << std::endl;
return 4;
}
}
@@ -133,7 +137,7 @@ int main(int argc, char ** argv) {
GeoGeometryPluginLoader loader;
GeoVGeometryPlugin *factory=loader.load(plugin);
if (!factory) {
- std::cerr << "Could not load plugin " << plugin << std::endl;
+ std::cerr << "gmcat -- Could not load plugin " << plugin << std::endl;
return 5;
}
@@ -155,7 +159,7 @@ int main(int argc, char ** argv) {
for (const std::string & file : inputFiles) {
GMDBManager* db = new GMDBManager(file);
if (!db->checkIsDBOpen()){
- std::cerr << "Error opening input file " << file << std::endl;
+ std::cerr << "gmcat -- Error opening the input file: " << file << std::endl;
return 6;
}
@@ -165,14 +169,15 @@ int main(int argc, char ** argv) {
/* build the GeoModel geometry */
GeoPhysVol* dbPhys = readInGeo.buildGeoModel(); // builds the whole GeoModel tree in memory
+ /* get an handle on a Volume Cursor, to traverse the whole set of Volumes */
GeoVolumeCursor aV(dbPhys);
+ /* loop over the Volumes in the tree */
while (!aV.atEnd()) {
GeoNameTag *nameTag=new GeoNameTag(aV.getName());
GeoTransform *transform= new GeoTransform(aV.getTransform());
world->add(nameTag);
world->add(transform);
- std::cout << "visiting: " << aV.getVolume()->getLogVol()->getName() << " [" << &*aV.getVolume() << "]" << std::endl;
world->add((GeoVPhysVol *) &*aV.getVolume());
aV.next();
}
@@ -187,7 +192,7 @@ int main(int argc, char ** argv) {
// check the DB connection
//
if (!db.checkIsDBOpen()) {
- std::cerr << "Error opening output file " << outputFile << std::endl;
+ std::cerr << "gmcat -- Error opening the output file: " << outputFile << std::endl;
return 7;
}
--
GitLab