Merge branch 'release/v10_04_07'

Author: kjplows

CMakeLists.txt

@@ -16,7 +16,7 @@
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbncode VERSION 10.04.06.01 LANGUAGES CXX)
+project(sbncode VERSION 10.04.07 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 

sbncode/Metadata/FileCatalogMetadataSBN_service.cc

@@ -61,13 +61,13 @@ void util::FileCatalogMetadataSBN::postBeginJob()
 
   // Add metadata.
 
-  mds->addMetadata("fcl.name", fFCLName);
-  mds->addMetadata(fExperiment + "_project.name", fProjectName);
-  mds->addMetadata(fExperiment + "_project.stage", fProjectStage);
-  mds->addMetadata(fExperiment + "_project.version", fProjectVersion);
-  mds->addMetadata(fExperiment + "_project.software", fProjectSoftware);
-  mds->addMetadata("production.name", fProductionName);
-  mds->addMetadata("production.type", fProductionType);
+  if (!fFCLName.empty()) mds->addMetadata("fcl.name", fFCLName);
+  if (!fProjectName.empty()) mds->addMetadata(fExperiment + "_project.name", fProjectName);
+  if (!fProjectStage.empty()) mds->addMetadata(fExperiment + "_project.stage", fProjectStage);
+  if (!fProjectVersion.empty()) mds->addMetadata(fExperiment + "_project.version", fProjectVersion);
+  if (!fProjectSoftware.empty()) mds->addMetadata(fExperiment + "_project.software", fProjectSoftware);
+  if (!fProductionName.empty()) mds->addMetadata("production.name", fProductionName);
+  if (!fProductionType.empty()) mds->addMetadata("production.type", fProductionType);
   std::ostringstream ostr;
   if(fMerge >= 0) {
     if(fMerge > 0)

ups/product_deps

@@ -254,11 +254,10 @@ libdir	fq_dir		lib
 product			version		qual	flags		<table_format=2>
 genie_xsec		v3_04_00	-
 larcv2			v2_2_6		-
-larsoft			v10_04_06	-
-sbnanaobj		v10_00_00	-
+larsoft			v10_04_07	-
+sbnalg		        v10_04_07	-
 sbndaq_artdaq_core	v1_10_06	-
 sbndata			v01_07		-
-sbnobj			v10_00_07	-
 systematicstools	v01_04_04	-
 nusystematics		v1_05_04	-
 cetmodules		v3_24_01	-	only_for_build
@@ -317,11 +316,11 @@ end_product_list
 #
 ####################################
 
-qualifier	larsoft		sbnobj		sbnanaobj	sbndaq_artdaq_core  genie_xsec              sbndata  larcv2           systematicstools  nusystematics     notes
-c14:debug	c14:debug	c14:debug	c14:debug	c14:s131:debug     AR2320i00000:e1000:k250  -nq-     c14:debug:p3915  c14:debug	        c14:debug	    -nq-
-c14:prof	c14:prof	c14:prof	c14:prof	c14:s131:prof      AR2320i00000:e1000:k250  -nq-     c14:p3915:prof   c14:prof          c14:prof	    -nq-
-e26:debug	e26:debug	e26:debug	e26:debug	e26:s131:debug     AR2320i00000:e1000:k250  -nq-     debug:e26:p3915  e26:debug	        e26:debug	    -nq-
-e26:prof	e26:prof	e26:prof	e26:prof	e26:s131:prof      AR2320i00000:e1000:k250  -nq-     e26:p3915:prof   e26:prof	        e26:prof	    -nq-
+qualifier	larsoft		sbnalg		sbndaq_artdaq_core  genie_xsec              sbndata  larcv2           systematicstools  nusystematics     notes
+c14:debug	c14:debug	c14:debug	c14:s131:debug     AR2320i00000:e1000:k250  -nq-     c14:debug:p3915  c14:debug	        c14:debug	    -nq-
+c14:prof	c14:prof	c14:prof	c14:s131:prof      AR2320i00000:e1000:k250  -nq-     c14:p3915:prof   c14:prof          c14:prof	    -nq-
+e26:debug	e26:debug	e26:debug	e26:s131:debug     AR2320i00000:e1000:k250  -nq-     debug:e26:p3915  e26:debug	        e26:debug	    -nq-
+e26:prof	e26:prof	e26:prof	e26:s131:prof      AR2320i00000:e1000:k250  -nq-     e26:p3915:prof   e26:prof	        e26:prof	    -nq-
 end_qualifier_list
 ####################################