From f303714695db06a8c5160449c3cc6e815af42422 Mon Sep 17 00:00:00 2001
From: Marcin Nowak <Marcin.Nowak@cern.ch>
Date: Fri, 31 Mar 2017 16:40:14 +0200
Subject: [PATCH] Rename AtlasCollectionTools/CollAppend to AthCollAppend
Rename what was AtlasCollectionTools/CollAppend.exe in CMT build and
became AtlasCollectionTools/CollAppend in CMake to AthCollAppend -
because there is a name conflict with APR/CollectionUtilities/CollAppend
Also removed AtlasCollectionTools/CollAppendXML which had no added
functionality and it was not used anywhere (that I could see)
---
.../test/run_CollUtils_xml | 4 +--
.../test/tagExtract_PUR.xml | 4 +--
.../src/Args2Container.dtd | 2 +-
.../AtlasCollectionTools/CMakeLists.txt | 5 +---
.../AtlasCollectionTools/cmt/requirements | 6 ++--
.../AtlasCollectionTools/src/CollAppend.cxx | 2 +-
.../src/CollAppendXML.cxx | 30 -------------------
Tools/PyJobTransformsMisc/share/merge_trf.py | 4 +--
8 files changed, 11 insertions(+), 46 deletions(-)
delete mode 100755 Database/AthenaPOOL/AtlasCollectionTools/src/CollAppendXML.cxx
diff --git a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/run_CollUtils_xml b/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/run_CollUtils_xml
index 5d2536033486..87d9716fc3f3 100755
--- a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/run_CollUtils_xml
+++ b/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/run_CollUtils_xml
@@ -3,7 +3,7 @@
DATADIR=/afs/cern.ch/atlas/offline/test/POOLCollectionTools
XMLINPUT=$DATADIR/tagExtract_PUR.xml
UTIL=CollAppend
-UTIL2=CollAppend.exe
+UTIL2=AthCollAppend
# remove detritus from previous tests
rm -f PoolCollectionCatalog.xml
@@ -24,7 +24,7 @@ fi
cmd="$UTIL -xmlInput $XMLINPUT"
echo $cmd
#$cmd
-# Check Atlas version CollAppend
+# Check Atlas version AthCollAppend
cmd="$UTIL2 -xmlInput $XMLINPUT"
echo $cmd
$cmd
diff --git a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/tagExtract_PUR.xml b/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/tagExtract_PUR.xml
index 7870d674fb96..af335bc0a64d 100644
--- a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/tagExtract_PUR.xml
+++ b/AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/tagExtract_PUR.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<!DOCTYPE ArgList>
<ArgList>
- <ToolInfo date="Tue Nov 9 18:49:00 2010
" toolID="CollAppend.exe">
+ <ToolInfo date="Tue Nov 9 18:49:00 2010
" toolID="AthCollAppend">
<CliArg name="QueryInfo" option="-query">
<datum/>
<CliArg name="DstInfo" option="-dst">
diff --git a/Database/APR/CollectionUtilities/src/Args2Container.dtd b/Database/APR/CollectionUtilities/src/Args2Container.dtd
index 24ef8df732b8..69d8bd95e13b 100644
--- a/Database/APR/CollectionUtilities/src/Args2Container.dtd
+++ b/Database/APR/CollectionUtilities/src/Args2Container.dtd
@@ -7,7 +7,7 @@
<!DOCTYPE ArgList>
<ArgList>
- <ToolInfo date="Mon May 24 18:13:30 2010
" toolID="CollAppend.exe">
+ <ToolInfo date="Mon May 24 18:13:30 2010
" toolID="AthCollAppend">
<CliArg name="QueryInfo" option="-query">
<datum>RunNumber=153200 AND (bitand(L1PassedTrigMaskTAV7, power(2,36)) = 0)</datum>
</CliArg>
diff --git a/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt b/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt
index 8a269318fdff..b02ece0dfb0e 100644
--- a/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt
+++ b/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt
@@ -24,13 +24,10 @@ atlas_add_library( AtlasCollectionTools
LINK_LIBRARIES GoodRunsListsLib
PRIVATE_LINK_LIBRARIES CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc )
-atlas_add_executable( CollAppend
+atlas_add_executable( AthCollAppend
src/CollAppend.cxx
LINK_LIBRARIES GoodRunsListsLib CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AtlasCollectionTools )
-atlas_add_executable( CollAppendXML
- src/CollAppendXML.cxx
- LINK_LIBRARIES GoodRunsListsLib CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AtlasCollectionTools )
# Install files from the package:
atlas_install_python_modules( python/countGuidsClient.py python/eventLookupClient.py )
diff --git a/Database/AthenaPOOL/AtlasCollectionTools/cmt/requirements b/Database/AthenaPOOL/AtlasCollectionTools/cmt/requirements
index 2e32146a1a99..d20067c71c21 100755
--- a/Database/AthenaPOOL/AtlasCollectionTools/cmt/requirements
+++ b/Database/AthenaPOOL/AtlasCollectionTools/cmt/requirements
@@ -12,10 +12,8 @@ library AtlasCollectionTools LumiMetaHandler.cxx GlobalUniqueKey.cxx GlobalSum.c
#application CollSplitByRun CollSplitByRun.cxx
#macro_append CollSplitByRun_dependencies " AtlasCollectionTools"
-application CollAppend CollAppend.cxx
-macro_append CollAppend_dependencies " AtlasCollectionTools"
-application CollAppendXML CollAppendXML.cxx
-macro_append CollAppendXML_dependencies " AtlasCollectionTools"
+application AthCollAppend CollAppend.cxx
+macro_append AthCollAppend_dependencies " AtlasCollectionTools"
#application GRLtest GRLtest.cxx
macro_append AtlasCollectionTools_cppflags " `xml2-config --cflags`"
diff --git a/Database/AthenaPOOL/AtlasCollectionTools/src/CollAppend.cxx b/Database/AthenaPOOL/AtlasCollectionTools/src/CollAppend.cxx
index e31e2e3298c6..367d047646ae 100755
--- a/Database/AthenaPOOL/AtlasCollectionTools/src/CollAppend.cxx
+++ b/Database/AthenaPOOL/AtlasCollectionTools/src/CollAppend.cxx
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
doh = metareg->insert(std::make_pair("WeightedEventSum",gsum)).second;
if (!doh) cerr << "Could not add " << gsum->name() << " for WeightedEventSum" << endl;
- string thisProgram("CollAppend.exe");
+ string thisProgram("AthCollAppend");
// Convert argv to vector of strings
vector<string> argv_v;
for( int i=0; i<argc; ++ i )
diff --git a/Database/AthenaPOOL/AtlasCollectionTools/src/CollAppendXML.cxx b/Database/AthenaPOOL/AtlasCollectionTools/src/CollAppendXML.cxx
deleted file mode 100755
index 7cd75338d98e..000000000000
--- a/Database/AthenaPOOL/AtlasCollectionTools/src/CollAppendXML.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file CollAppendXML.cpp
- * @brief Utility to generate XML for CollAppend argument list
- * @author K. Karr <Kristo.Karr@cern.ch>
- * @author Marcin.Nowak@cern.ch
- * $Id: CollAppendXML.cxx,v 1.31 2009-05-04 15:57:47 cranshaw Exp $
- */
-
-#include "CollectionUtilities/CollAppendBase.h"
-#include <iostream>
-
-using namespace std;
-using namespace pool;
-
-int main(int argc, char *argv[])
-{
- string thisProgram("CollAppend.exe");
- // Convert argv to vector of strings
- vector<string> argv_v;
- for( int i=0; i<argc; ++ i )
- argv_v.push_back( argv[i] );
-
- CollAppendBase worker(thisProgram);
- return worker.execute( argv_v );
-}
-
diff --git a/Tools/PyJobTransformsMisc/share/merge_trf.py b/Tools/PyJobTransformsMisc/share/merge_trf.py
index b016369c0417..2222d3eb680e 100755
--- a/Tools/PyJobTransformsMisc/share/merge_trf.py
+++ b/Tools/PyJobTransformsMisc/share/merge_trf.py
@@ -126,9 +126,9 @@ MERGEDICT = { 'ntuple': { 'scriptpath' : 'hadd',
'verifymerge' : verifyTAGmerge,
'posttrfaction' : 'mv %(outputfile)s.root %(outputfile)s'
},
- 'tag1': { 'scriptpath' : 'export ROOTENV_NO_HOME=1; CollAppend.exe',
+ 'tag1': { 'scriptpath' : 'export ROOTENV_NO_HOME=1; AthCollAppend',
'usage' : '%(scriptpath)s -src %(inputfilelist)s -dst %(outputfile)s %(extraopts)s',
- 'description' : 'Merge TAG files with CollAppend.exe (Atlas)',
+ 'description' : 'Merge TAG files with AthCollAppend (Atlas)',
'splitinputfilelist' : True,
'extraopts' : '-nevtcached 5000 -merge',
'inputfilelistseparator' : ' ',
--
GitLab