Merge branch 'larcafjobs' into 'master'

LArCafJobs: cmake cleanup and remove HLT menu dump

See merge request atlas/athena!41710

LArCalorimeter/LArCafJobs/CMakeLists.txt

-################################################################################
-# Package: LArCafJobs
-################################################################################
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( LArCafJobs )
 
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Matrix Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
+find_package( Boost )
+find_package( ROOT COMPONENTS Core Tree MathCore Matrix Hist Graf RIO )
 
 
 # Component(s) in the package:
@@ -33,30 +31,29 @@ atlas_add_library( LArCafJobsLib
                    src/LArHECNoise.cxx
                    src/LArReadCells.cxx
                    PUBLIC_HEADERS LArCafJobs
-                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} 
-                   LINK_LIBRARIES CaloIdentifier AthenaBaseComps AthenaKernel GaudiKernel LArIdentifier LArRawConditions LArRawEvent egammaEvent TrigSteeringEvent McParticleEvent StoreGateLib SGtests LArToolsLib TrigDecisionToolLib CaloDetDescrLib AthAnalysisToolsLib TrigAnalysisInterfaces CaloInterfaceLib 
-                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result AtlasHepMCLib LArRecEvent )
+                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthAnalysisToolsLib AthenaBaseComps AthenaKernel CaloConditions CaloDetDescrLib CaloIdentifier CaloInterfaceLib GaudiKernel Identifier LArCablingLib LArElecCalib LArIdentifier LArRawConditions LArRawEvent LArRecConditions StoreGateLib TrigAnalysisInterfaces TrigConfInterfaces TrigDecisionToolLib egammaEvent
+                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} AthenaPoolUtilities CaloEvent CaloGeoHelpers LArRecEvent NavFourMom TrigSteeringEvent TrigT1Result xAODEventInfo )
 
 atlas_add_component( LArCafJobs
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} 
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent egammaEvent LArToolsLib TrigDecisionToolLib TrigSteeringEvent CaloDetDescrLib DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result LArCafJobsLib )
+                     LINK_LIBRARIES LArCafJobsLib )
 
 atlas_add_dictionary( LArCafJobsDict
                       LArCafJobs/LArCafJobsDict.h
                       LArCafJobs/selection.xml
-                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} 
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArToolsLib TrigDecisionToolLib TrigSteeringEvent CaloDetDescrLib DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result LArCafJobsLib )
+                      LINK_LIBRARIES LArCafJobsLib )
 
 atlas_add_executable( LArQuickHistMerge
                       src/LArQuickHistMerge.cxx
-                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArToolsLib TrigDecisionToolLib TrigSteeringEvent CaloDetDescrLib DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result LArCafJobsLib )
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} DataQualityUtils )
 
 atlas_add_executable( LArSamplesMerge
                       src/LArSamplesMerge.cxx
-                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArToolsLib TrigDecisionToolLib TrigSteeringEvent CaloDetDescrLib DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result LArCafJobsLib )
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} LArCafJobsLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArCafJobs/LArShapeDumper.h"
@@ -37,14 +37,6 @@
 
 #include "boost/regex.hpp"
 
-#include "TrigConfHLTData/HLTChain.h"
-#include "TrigConfHLTData/HLTChainList.h"
-#include "TrigConfHLTData/HLTSequence.h"
-#include "TrigConfHLTData/HLTSequenceList.h"
-
-// #include "LArCafJobs/HistoryContainer.h"
-// #include "LArCafJobs/TreeAccessor.h"
-
 
 #include <vector>
 #include <iostream>
@@ -154,22 +146,8 @@ StatusCode LArShapeDumper::initialize()
 StatusCode LArShapeDumper::start()
 {
   m_runData = new RunData(0);
-  static unsigned int i = 0;
 
   if (m_doTrigger) {
-    std::ofstream xmlfile(Form("frame_%d.xml", i++));
-    xmlfile << "      <SEQUENCE_LIST>" << std::endl; 
-    for(TrigConf::HLTSequence *seq : m_configSvc->sequences())
-       seq->writeXML(xmlfile);
-    xmlfile << "      </SEQUENCE_LIST>" << std::endl; 
-
-    //chains
-    xmlfile << "      <CHAIN_LIST>" << std::endl; 
-    for(TrigConf::HLTChain *ch: m_configSvc->chains() )
-       ch->writeXML(xmlfile);
-
-    xmlfile << "      </CHAIN_LIST>" << std::endl; 
-
     std::vector<boost::regex> regexs;
     for (std::vector<std::string>::const_iterator name = m_triggerNames.begin(); 
          name != m_triggerNames.end(); name++)