Split from dunetpc. Changes to includes/CMake files

CMakeLists.txt

@@ -1,149 +1,47 @@
 # ======================================================================
-#  larsoft main build file
-#
-#  cd .../path/to/build/directory
-#  source .../path/to/larsoft/ups/setup_for_development <-d|-p>
-#  cmake [-DCMAKE_INSTALL_PREFIX=/install/path]
-#        -DCMAKE_BUILD_TYPE=$CETPKG_TYPE
-#        $CETPKG_SOURCE
-#  make
-#  make test
-#  make install
-#  make package (builds distribution tarfile)
-# ======================================================================
-# LarSoft is an empty product
-# It sets up all of the larsoft ups products (lardata, larsim, larreco, etc.)
+#  dunecalib main build file
 # ======================================================================
 
-cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 
-project(dunetpc VERSION 09.41.00.02 LANGUAGES CXX)
+cmake_minimum_required (VERSION 3.19 FATAL_ERROR)
+
+project(dunecalib VERSION 09.41.00.02 LANGUAGES CXX)
 
 # cetbuildtools contains our cmake modules
 find_package(cetbuildtools REQUIRED)
 
-# Make target names shorter (dune::X vs dunetpc::dune_X).
-set(dunetpc_NAMESPACE dune)
+list(APPEND CMAKE_MODULE_PATH $ENV{CANVAS_ROOT_IO_DIR}/Modules)
+list(APPEND CMAKE_MODULE_PATH $ENV{ART_DIR}/Modules)
 
-# Project variable defaults (_INIT) and overrides.
-set(${PROJECT_NAME}_SCRIPTS_DIR_INIT scripts)
 
 include(CetCMakeEnv)
 cet_cmake_env()
 
-# Find our own CMake modules, and tell everyone else where to find them.
-cet_cmake_module_directories(Modules BINARY)
-
 cet_set_compiler_flags(DIAGS CAUTIOUS
   WERROR
   NO_UNDEFINED
   EXTRA_FLAGS -pedantic -Wno-unused-local-typedefs
 )
-##add_definitions(-DGENIE_PRE_R3)
 
 cet_report_compiler_flags()
 
-# these are minimum required versions, not the actual product versions
-find_ups_boost( ) # Needs to be first to cover for a missing transitive
-                  # dependency from artdaq_core.
-find_ups_geant4( )
-find_ups_root( )
-
-find_ups_product( eigen )
-include_directories( $ENV{EIGEN_INC} )
-
-find_ups_product( art v3_09_00 )
+find_ups_product( art )
 find_ups_product( art_root_io )
-find_ups_product( artdaq_core v01_03_6 )
-find_ups_product( canvas )
 find_ups_product( canvas_root_io )
-find_ups_product( cetlib_except )
-find_ups_product( cetlib )
-find_ups_product( clhep v2_1_3_0 )
-find_ups_product( dune_raw_data )
-find_ups_product( dunepdsprce v0_0_3 )
-find_ups_product( dunedetdataformats )
-find_ups_product( dunedaqdataformats )
-find_ups_product( fhiclcpp )
-find_ups_product( genie )
-find_ups_product( hdf5 v1_12_0b )
-find_ups_product( hep_concurrency )
-find_ups_product( ifdh_art )
-find_ups_product( ifdhc )
-find_ups_product( larana )
+find_ups_boost( )
+find_ups_root()
+find_ups_product( cetbuildtools )
 find_ups_product( larcore )
 find_ups_product( larcorealg )
-find_ups_product( larcoreobj )
-find_ups_product( lardata )
-find_ups_product( lardataalg )
-find_ups_product( lardataobj )
-find_ups_product( larevt )
-find_ups_product( larpandora )
-find_ups_product( larreco )
-find_ups_product( larsim )
-find_ups_product( messagefacility v1_10_00 )
 find_ups_product( nuevdb )
-find_ups_product( nug4 )
-find_ups_product( nugen )
-find_ups_product( nurandom )
-find_ups_product( nusimdata )
-find_ups_product( nusystematics  )
-find_ups_product( nutools )
-find_ups_product( pandora )
-find_ups_product( postgresql v9_1_5 )
-find_ups_product( systematicstools  )
-find_ups_product( fftw )
-if(DEFINED ENV{CAFFE_LIB} )
-  find_ups_product(caffe)
-endif()
-if(DEFINED ENV{LAPACK_LIB} )
-  find_ups_product( lapack )
-endif()
-
-if(( DEFINED ENV{TENSORFLOW_DIR} ) AND ( DEFINED ENV{TRITON_DIR} ))
-  # find tensorflow library
-  find_ups_product( protobuf )
-  find_ups_product( tensorflow )
-  find_ups_product( triton )
-  find_ups_product( larrecodnn )
-  cet_find_library(TENSORFLOW_CC NAMES tensorflow_cc PATHS ENV TENSORFLOW_LIB NO_DEFAULT_PATH )
-  cet_find_library(TENSORFLOW_FRAMEWORK NAMES tensorflow_framework PATHS ENV TENSORFLOW_LIB NO_DEFAULT_PATH )
-  set(TENSORFLOW TENSORFLOW_CC TENSORFLOW_FRAMEWORK)
-  cet_find_library(PROTOBUF NAMES protobuf PATHS ENV PROTOBUF_LIB NO_DEFAULT_PATH )
-endif()
-# artdaq_core Utility library
-cet_find_library( ARTDAQ-CORE_UTILITIES NAMES artdaq-core_Utilities PATHS ENV ARTDAQ_CORE_LIB )
-
-string(TOUPPER ${CMAKE_BUILD_TYPE} BTYPE_UC )
-if( ${BTYPE_UC} MATCHES "DEBUG" )
- find_library( LIBHDF5 NAMES hdf5_debug PATHS ENV HDF5_LIB NO_DEFAULT_PATH)
-else()
- find_library( LIBHDF5 NAMES hdf5 PATHS ENV HDF5_LIB NO_DEFAULT_PATH)
-endif()
-include_directories(${HDF5_INCLUDE_DIRS})
-
-
-# Define an export set for tool support to enable simpler per-tool build
-# call.
-cet_register_export_set(SET_NAME PluginTypes NAMESPACE art_plugin_types)
+find_ups_geant4( )
 
-# macros for dictionary and simple_plugin
+# macros for artdaq_dictionary and simple_plugin
 include(ArtDictionary)
 include(ArtMake)
 include(BuildPlugins)
 
-# ADD SOURCE CODE SUBDIRECTORIES HERE
-add_subdirectory(dune)
-# release database
-add_subdirectory(releaseDB)
-# subdirectory for test code
-add_subdirectory(test)
-# CMake Modules
-add_subdirectory(Modules)
-# ups - table and config files
+add_subdirectory(dunecalib)
 add_subdirectory(ups)
-# subdirectory for fcl files
-add_subdirectory(fcl)
 
-# packaging utility
 include(UseCPack)

Modules/MakeDuneToolBuilder.cmake

@@ -18,5 +18,5 @@ function(make_dune_tool_builder NAME)
   cet_make_plugin_builder(${NAME} ${BASE} ${dest_subdir} ${kw} ${ARGN}
     LIBRARIES
     CONDITIONAL "$<$<TARGET_EXISTS:${NAME}>:${NAME}>"
-    REG dune::ArtSupport)
+    REG dunecore::ArtSupport)
 endfunction()

dunecalib/CMakeLists.txt

@@ -1,99 +1,2 @@
-set( IFDH_ART_DIR $ENV{IFDH_ART_DIR} )
-
-add_subdirectory(DuneExample)
-add_subdirectory(DuneObj)
-add_subdirectory(DuneObjDumpers)
-add_subdirectory(ArtSupport)
-add_subdirectory(DuneInterface)
-include(dune::ToolTypes) # Enable simpler building of tools.
-add_subdirectory(DuneServiceAccess)
-add_subdirectory(DuneCommon)
-add_subdirectory(Geometry)
-add_subdirectory(Utilities)
-add_subdirectory(Simulation)
-add_subdirectory(LArG4)
-add_subdirectory(PhotonPropagation)
-add_subdirectory(OpticalDetector)
-add_subdirectory(DetSim)
-add_subdirectory(DetectorVariations)
-add_subdirectory(EventGenerator)
-add_subdirectory(Daq)
-add_subdirectory(CalData)
-add_subdirectory(DataPrep)
-add_subdirectory(EnergyStudies)
-add_subdirectory(AnaTree)
-add_subdirectory(HitFinderDUNE)
-add_subdirectory(TrackFinderDUNE)
-add_subdirectory(HDF5Utils)
-add_subdirectory(DUNEPandora)
-add_subdirectory(SimFilter)
-add_subdirectory(FDSensOpt)
-add_subdirectory(TrackingAna)
-add_subdirectory(ShowerAna)
-add_subdirectory(HitAnalysis)
-add_subdirectory(EventFilters)
-add_subdirectory(ClusterFinderDUNE)
-add_subdirectory(RecoAlgDUNE)
-add_subdirectory(Protodune)
-add_subdirectory(DAQTriggerSim)
-add_subdirectory(SpaceCharge)
-add_subdirectory(SpaceChargeServices)
-add_subdirectory(SupernovaAna)
-#add_subdirectory(DataOverlay)
-add_subdirectory(DAQSimAna)
-add_subdirectory(3x1x1dp)
-add_subdirectory(CVN)
-add_subdirectory(BeamData)
 add_subdirectory(Calib)
 add_subdirectory(CalibServices)
-add_subdirectory(CAFMaker)
-add_subdirectory(RegCNN)
-add_subdirectory(Iceberg)
-add_subdirectory(DUNEWireCell)
-add_subdirectory(APAIO)
-add_subdirectory(ProductFilters)
-add_subdirectory(AnaUtils)
-add_subdirectory(TrackPID)
-add_subdirectory(PandoraAnalysis)
-add_subdirectory(InfillChannels)
-add_subdirectory(VLNets)
-add_subdirectory(Coldbox)
-
-# Respect the order specified in lar_build, which is:
-#
-#     "SoftRelTools",
-#     "SRT_LAR",
-#     "SimpleTypesAndConstants",
-#     "larcorealg_Geometry",
-#     "larcoreobj_SummaryData",
-#     "lardataobj_RawData",
-#     "lardataobj_RecoBase",
-#     "lardataobj_OpticalDetectorData",
-#     "lardataobj_AnalysisBase",
-#     "lardata_Utilities",
-#     "larsim_Simulation nug4::ParticleNavigation lardataobj_Simulation",
-#     "larsim_MCCheater",
-#     "larreco_Calorimetry",
-#     "lardata_RecoObjects",
-#     "larreco_RecoAlg",
-#     "larsim_LegacyLArG4",
-#     "larsim_PhotonPropagation",
-#     "larsim_DetSim",
-#     "larsim_EventGenerator",
-#     "larevt_Filters",
-#     "CalData",
-#     "larreco_ClusterFinder",
-#     "larreco_Genfit",
-#     "larreco_HitFinder",
-#     "larreco_TrackFinder",
-#     "larreco_VertexFinder",
-#     "larreco_EventFinder",
-#     "larsim_TriggerAlgo",
-#     "larana_OpticalDetector",
-#     "larreco_Calorimetry",
-#     "larreco_ShowerFinder",
-#     "lareventdisplay_EventDisplay",
-#     "larana_ParticleIdentification",
-#     "larexamples_AnalysisExample",
-#     "LArPandoraAlgorithms",
-#     "larpandora_LArPandoraInterface"

dunecalib/Calib/CMakeLists.txt

@@ -6,7 +6,7 @@ cet_find_library( WDALIB NAMES wda PATHS ENV LIBWDA_LIB NO_DEFAULT_PATH )
 
 FILE (GLOB src_files *.cxx)
 
-art_make_library(  LIBRARY_NAME  dune_Calib
+art_make_library(  LIBRARY_NAME  dunecalib_Calib
 		        SOURCE ${src_files}
 			LIBRARIES
 	                wda
@@ -21,13 +21,13 @@ art_make_library(  LIBRARY_NAME  dune_Calib
 art_make_exec( NAME getXYZCalibProtoDUNE
                SOURCE getXYZCalibProtoDUNE.cc                 
                LIBRARIES
-			dune_Calib
+			dunecalib_Calib
                )
 
 art_make_exec( NAME getLinConstsProtoDUNE
                SOURCE getLinConstsProtoDUNE.cc                 
                LIBRARIES
-			dune_Calib
+			dunecalib_Calib
                )
 
 install_headers()

dunecalib/Calib/LifetimeCalibProtoDUNE.cxx

@@ -18,7 +18,7 @@
 #include <iomanip> 
 
 // LArSoft includes
-#include "dune/Calib/LifetimeCalibProtoDUNE.h"
+#include "dunecalib/Calib/LifetimeCalibProtoDUNE.h"
 
 // nutools includes
 #include "nuevdb/IFDatabase/Table.h"

dunecalib/Calib/LifetimeCalibProtoDUNE.h

@@ -24,7 +24,7 @@
 #include <map>
 
 // dunetpc includes
-#include "dune/Calib/LifetimeCalib.h"
+#include "dunecalib/Calib/LifetimeCalib.h"
 
 namespace calib {
 

dunecalib/Calib/LinCalibProtoDUNE.cxx

@@ -17,7 +17,7 @@
 #include "stdio.h"
 
 // LArSoft includes
-#include "dune/Calib/LinCalibProtoDUNE.h"
+#include "dunecalib/Calib/LinCalibProtoDUNE.h"
 
 // nutools includes
 #include "nuevdb/IFDatabase/Table.h"

dunecalib/Calib/LinCalibProtoDUNE.h

@@ -24,7 +24,7 @@
 #include <map>
 
 // dunetpc includes
-#include "dune/Calib/LinCalib.h"
+#include "dunecalib/Calib/LinCalib.h"
 
 namespace calib {
 

dunecalib/Calib/XYZCalibProtoDUNE.cxx

@@ -16,7 +16,7 @@
 #include "stdio.h"
 
 // LArSoft includes
-#include "dune/Calib/XYZCalibProtoDUNE.h"
+#include "dunecalib/Calib/XYZCalibProtoDUNE.h"
 
 // nutools includes
 #include "nuevdb/IFDatabase/Table.h"

dunecalib/Calib/XYZCalibProtoDUNE.h

@@ -23,7 +23,7 @@
 #include <map>
 
 // dunetpc includes
-#include "dune/Calib/XYZCalib.h"
+#include "dunecalib/Calib/XYZCalib.h"
 
 namespace calib {
 

dunecalib/Calib/getLinConstsProtoDUNE.cc

@@ -1,4 +1,4 @@
-#include "dune/Calib/LinCalibProtoDUNE.h"
+#include "dunecalib/Calib/LinCalibProtoDUNE.h"
 
 #include "nuevdb/IFDatabase/Table.h"
 #include <getopt.h>

dunecalib/Calib/getXYZCalibProtoDUNE.cc

@@ -1,4 +1,4 @@
-#include "dune/Calib/XYZCalibProtoDUNE.h"
+#include "dunecalib/Calib/XYZCalibProtoDUNE.h"
 
 #include "nuevdb/IFDatabase/Table.h"
 #include <getopt.h>

dunecalib/CalibServices/CMakeLists.txt

@@ -1,5 +1,5 @@
 cet_build_plugin(XYZCalibServiceProtoDUNE art::service
-              dune_Calib
+              dunecalib_Calib
 	      ART_FRAMEWORK_CORE
 	      ART_FRAMEWORK_PRINCIPAL
 	      ART_FRAMEWORK_SERVICES_REGISTRY
@@ -18,7 +18,7 @@ cet_build_plugin(XYZCalibServiceProtoDUNE art::service
 )
 
 cet_build_plugin(LifetimeCalibServiceProtoDUNE art::service
-      dune_Calib
+      dunecalib_Calib
       ART_FRAMEWORK_CORE
       ART_FRAMEWORK_PRINCIPAL
       ART_FRAMEWORK_SERVICES_REGISTRY

dunecalib/CalibServices/LifetimeCalibService.h

@@ -12,7 +12,7 @@
 
 #include "fhiclcpp/ParameterSet.h"
 #include "art/Framework/Services/Registry/ServiceMacros.h"
-#include "dune/Calib/LifetimeCalib.h"
+#include "dunecalib/Calib/LifetimeCalib.h"
 #include "larcore/CoreUtils/ServiceUtil.h"
 
 namespace calib{

dunecalib/CalibServices/LifetimeCalibServiceProtoDUNE.h

@@ -16,8 +16,8 @@
 #include "art/Framework/Services/Registry/ServiceMacros.h"
 #include "art/Framework/Principal/Run.h"
 #include "art/Framework/Principal/Event.h"
-#include "dune/Calib/LifetimeCalibProtoDUNE.h"
-#include "dune/CalibServices/LifetimeCalibService.h"
+#include "dunecalib/Calib/LifetimeCalibProtoDUNE.h"
+#include "dunecalib/CalibServices/LifetimeCalibService.h"
 
 namespace calib{
   class LifetimeCalibServiceProtoDUNE : public LifetimeCalibService {