diff --git a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
index ddcaddd525d3f7452901616e663bb83fecf737c5..00bf3e641e139d4d1da159d2c11637ae2669607c 100644
--- a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
@@ -52,4 +52,3 @@ atlas_add_component( TrigServices
# Install files from the package:
atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
diff --git a/HLT/Trigger/TrigControl/TrigServices/share/hadd.C b/HLT/Trigger/TrigControl/TrigServices/share/hadd.C
deleted file mode 100644
index f566a4f55c1f3977bdf581ae31435c5c02b3dcf3..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigServices/share/hadd.C
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-
- NOTE: This macro is kept for back compatibility only.
- Use instead the executable $ROOTSYS/bin/hadd
-
- This macro will add histograms from a list of root files and write them
- to a target root file. The target file is newly created and must not be
- identical to one of the source files.
-
- Author: Sven A. Schmidt, sven.schmidt@cern.ch
- Date: 13.2.2001
-
- This code is based on the hadd.C example by Rene Brun and Dirk Geppert,
- which had a problem with directories more than one level deep.
- (see macro hadd_old.C for this previous implementation).
-
- The macro from Sven has been enhanced by
- Anne-Sylvie Nicollerat <Anne-Sylvie.Nicollerat@cern.ch>
- to automatically add Trees (via a chain of trees).
-
- To use this macro, modify the file names in function hadd.
-
- NB: This macro is provided as a tutorial.
- Use $ROOTSYS/bin/hadd to merge many histogram files
-
- ATLAS HLT COMMENT by T. Bold:
- This is modified macro used to deal with the sort of strange
- ROOT files generated while athenaMT is run. There possibly
- number of the output files. With this one can work whit standard hadd.
- But in fact there is number of the TTrees in the file
- having the same name, just subsequent sequence(version) number.
- This can only be handled by this script.
- */
-
-
-#include <string.h>
-#include "TChain.h"
-#include "TFile.h"
-#include "TH1.h"
-#include "TTree.h"
-#include "TKey.h"
-#include "Riostream.h"
-
-TList *FileList;
-TFile *Target;
-
-void MergeRootfile( TDirectory *target, TList *sourcelist );
-
-
-void hadd() {
- // in an interactive ROOT session, edit the file names
- // Target and FileList, then
- // root > .L hadd.C
- // root > hadd()
-
- Target = TFile::Open( "result.root", "RECREATE" );
-
- FileList = new TList();
- FileList->Add( TFile::Open("hsimple1.root") );
- FileList->Add( TFile::Open("hsimple2.root") );
-
- MergeRootfile( Target, FileList );
-
-}
-
-TTree * mergeCircularTrees(const char* treename, TDirectory *dir, TTree *nTree = 0) {
-
- TString basename(treename);
- TIter nextIter(gDirectory->GetListOfKeys());
- gDirectory->GetListOfKeys()->Print();
- TKey *obj;
- TTree *tptr;
- TList myTreesList;
-
- while ( (obj = (TKey *)nextIter()) != 0 ) {
-
- if ( TString(obj->GetClassName()) == TString("TTree") ) {
- // it is the tree let's read it in
- tptr = (TTree *)obj->ReadObj();
- if ( TString(tptr->GetName()) == basename ) {
- if ( nTree == 0 ) {
- nTree = (TTree*)tptr->Clone();
- nTree->SetCircular(kMaxLong64); // maximum circularity
- }
- else
- myTreesList.AddLast(tptr);
- }
- }
- }
-
- dir->cd();
- nTree->SetDirectory(dir);
- nTree->Merge(&myTreesList);
- return nTree;
-}
-
-void MergeRootfile( TDirectory *target, TList *sourcelist ) {
-
- // cout << "Target path: " << target->GetPath() << endl;
- TString path( (char*)strstr( target->GetPath(), ":" ) );
- path.Remove( 0, 2 );
-
- TFile *first_source = (TFile*)sourcelist->First();
- first_source->cd( path );
- TDirectory *current_sourcedir = gDirectory;
- //gain time, do not add the objects in the list in memory
- Bool_t status = TH1::AddDirectoryStatus();
- TH1::AddDirectory(kFALSE);
-
- // loop over all keys in this directory
- TTree *nTree = 0;
- TIter nextkey( current_sourcedir->GetListOfKeys() );
- TKey *key, *oldkey=0;
- while ( (key = (TKey*)nextkey())) {
- // cout << "found key " << key->GetName() << endl;
- //keep only the highest cycle number for each key
- if (oldkey)
- if ( strcmp(oldkey->GetName(),key->GetName()) == 0 ) {
- // cout << "skipping key " << key->GetName() << endl;
- continue;
- }
- // always set oldkey ptr
- oldkey = key;
-
- // read object from first source file
- first_source->cd( path );
- TObject *obj = key->ReadObj();
-
- if ( obj->IsA()->InheritsFrom( "TH1" ) ) {
- // descendant of TH1 -> merge it
-
- // cout << "Merging histogram " << obj->GetName() << endl;
- TH1 *h1 = (TH1*)obj;
-
- // loop over all source files and add the content of the
- // correspondant histogram to the one pointed to by "h1"
- TFile *nextsource = (TFile*)sourcelist->After( first_source );
- while ( nextsource ) {
-
- // make sure we are at the correct directory level by cd'ing to path
- nextsource->cd( path );
- TKey *key2 = (TKey*)gDirectory->GetListOfKeys()->FindObject(h1->GetName());
- if (key2) {
- TH1 *h2 = (TH1*)key2->ReadObj();
- h1->Add( h2 );
- delete h2;
- }
-
- nextsource = (TFile*)sourcelist->After( nextsource );
- }
- }
- else if ( obj->IsA()->InheritsFrom( "TTree" ) ) {
-
- // loop over all source files create a chain of Trees "globChain"
- const char* obj_name= obj->GetName();
- cout << "merging all trees in first file" << endl;
- nTree = mergeCircularTrees(obj_name, target);
- cout << "merged trees in first file" << endl;
-
- TFile *nextsource = (TFile*)sourcelist->After( first_source );
-
- while ( nextsource ) {
- nextsource->cd( path );
- cout << "merging all trees in file "<< nextsource->GetName() << endl;
- mergeCircularTrees(obj_name, target, nTree);
- cout << "merged all trees "<< nextsource->GetName() << endl;
- nextsource = (TFile*)sourcelist->After( nextsource );
- }
-
- } else if ( obj->IsA()->InheritsFrom( "TDirectory" ) ) {
- // it's a subdirectory
-
- cout << "Found subdirectory " << obj->GetName() << endl;
-
- // create a new subdir of same name and title in the target file
- target->cd();
- TDirectory *newdir = target->mkdir( obj->GetName(), obj->GetTitle() );
-
- // newdir is now the starting point of another round of merging
- // newdir still knows its depth within the target file via
- // GetPath(), so we can still figure out where we are in the recursion
- MergeRootfile( newdir, sourcelist );
-
- } else {
-
- // object is of no type that we know or can handle
- cout << "Unknown object type, name: "
- << obj->GetName() << " title: " << obj->GetTitle() << endl;
- }
-
- // now write the merged histogram (which is "in" obj) to the target file
- // note that this will just store obj in the current directory level,
- // which is not persistent until the complete directory itself is stored
- // by "target->Write()" below
- if ( obj ) {
- target->cd();
-
- //!!if the object is a tree, it is stored in globChain...
- if(obj->IsA()->InheritsFrom( "TTree" )) {
- nTree->Write();
- nTree->Print();
- }
- else
- obj->Write( key->GetName() );
- }
-
- } // while ( ( TKey *key = (TKey*)nextkey() ) )
-
- // save modifications to target file
- target->SaveSelf(kTRUE);
- TH1::AddDirectory(status);
-}
diff --git a/HLT/Trigger/TrigControl/TrigServices/share/hadd.sh b/HLT/Trigger/TrigControl/TrigServices/share/hadd.sh
deleted file mode 100755
index f68f3bd59d3ff9296ea3ec97f77303d46ce697dc..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigServices/share/hadd.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-# generate the script for ROOT hadd.C
-
-#script which will be generated in order to do the merging job
-sums=thishadd.C
-
-# find out where hadd.C is located
-haddmacro=$( dirname $(which hadd.sh))"/hadd.C"
-#echo $haddmacro
-
-if [ ! -f $haddmacro ]
- then
- echo "$haddmacro macro could not be found"
- echo "It is expected to be in the same directory as hadd.sh"
- echo "Check your installation!"
- exit 0
-fi
-
-
-# make local copy of the macro
-cp $haddmacro .
-
-
-if [ $# -lt 2 ]
- then
- echo "Usage: hadd.sh destination source1|source2|..."
- exit 127
-fi
-
-output=$1
-shift 1
-
-#build the actual script
-echo "{
-gROOT->LoadMacro(\"hadd.C+\");
-TFile *foutput = TFile::Open(\"$output\",\"NEW\");
-if ( foutput == 0 ) {
- cout << \"output file already exist, exitting ...\" << endl;
- gROOT->ProcessLine(\".q\");
-}
-TList *inputs = new TList();
-
-" > $sums
-
-
-
-echo "INPUT FILES: " `ls $@`
-echo "OUTPUT FILE: " $output
-
-# trick to expand wildcards
-for f in `ls $@`
-do
- echo "inputs->AddLast( TFile::Open (\"$f\") );" >> $sums
-done
-
-echo "
-MergeRootfile(foutput , inputs);
-foutput->Close();
-gROOT->ProcessLine(\".q\");
-}
-" >> $sums
-echo "EXECUTING ROOT to merge files: "
-root -l -b $sums
-# do cleanup
-rm -f $sums hadd.C
-echo "done"
\ No newline at end of file