From c79cae7c13e7a4c589512b0ef8da730df6125efe Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Mon, 8 Nov 2021 16:02:31 -0800
Subject: [PATCH] Drop references to Athena from the GeoModelXml code
---
GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h | 6 +++---
GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx | 2 +-
.../GeoModelXML/GeoModelXml/src/MulticopyProcessor.cxx | 2 +-
GeoModelTools/GeoModelXML/GeoModelXml/src/OutputDirector.h | 6 +-----
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h
index b2f671511..0b3cca3a8 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef GEO_MODEL_XML_GMX2GEO_H
@@ -30,9 +30,9 @@
// Use:
// #include "GeoModelXml/Gmx2Geo.h"
// #include "GeoModelXml/GmxInterface.h"
-// ...create your world volume and do all the Athena setup...
+// ...create your world volume ...
// ... get the filename with the xml in:
-// std::string xmlfilename; some athena stuff to get filename from the job options...
+// std::string xmlfilename; ...
// ...create your envelope GeoPhysVol...
// GeoPhysVol *sct(...);
// GmxInterface gmxInterface;
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
index 75d2c6072..ade840b91 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
@@ -42,7 +42,7 @@ Gmx2Geo::Gmx2Geo(const string xmlFile, GeoPhysVol *addHere, GmxInterface &gmxInt
DOMDocument *doc = createDOMDocument(xmlFile, parser, flags);
if (!doc) {// Parsed badly
XMLPlatformUtils::Terminate();
- msglog << MSG::FATAL << "Error in xml file " << xmlFile << ". Exiting athena." << endmsg;
+ msglog << MSG::FATAL << "Error in xml file " << xmlFile << ". Exiting program." << endmsg;
std::abort();
}
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MulticopyProcessor.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MulticopyProcessor.cxx
index e5b5d7c32..4e6871a77 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MulticopyProcessor.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MulticopyProcessor.cxx
@@ -203,7 +203,7 @@ DOMDocument *doc = element->getOwnerDocument();
else {
msglog << MSG::FATAL <<
"multicopyprocessor: error in " << name << ". <transform> object was neither assemblyref nor logvolref\n"
- << "Exiting Athena" << endmsg;
+ << "Exiting program" << endmsg;
std::abort();
}
}
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/OutputDirector.h b/GeoModelTools/GeoModelXML/GeoModelXml/src/OutputDirector.h
index 2f2277ee1..b925e3175 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/OutputDirector.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/OutputDirector.h
@@ -1,11 +1,7 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-//
-// Use gaudi messaging service when in Athena; use cout when "stand-alone".
-//
-
#ifndef OUTPUTDIRECTOR_H
#define OUTPUTDIRECTOR_H
--
GitLab