Merge remote-tracking branch 'origin/develop' into greenlee_fix_cmake

Author: hgreenlee

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.20.05 LANGUAGES CXX)
+project(sbncode VERSION 10.20.06 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 

sbncode/SinglePhotonAnalysis/NCDeltaRadiative_module.cc

@@ -161,7 +161,7 @@ bool NCDeltaRadiative::filter(art::Event & e) {
       simb::MCParticle const & mcp = mct.GetParticle(i);
       if(mcp.TrackId() != i) {
   std::cout << "ERROR: " << __LINE__ << " " << __PRETTY_FUNCTION__ << "\nTrackId does not match index\n";
-  exit(1);
+  return false;
       }
       if(!(mcp.StatusCode() == 1 && mcp.PdgCode() == 22)) continue;
       exiting_photon_parents.push_back(mcp.Mother());
@@ -173,7 +173,7 @@ bool NCDeltaRadiative::filter(art::Event & e) {
     //CHEKC hardcode, TPC filter:
     if(abs(mcp.Vx())>210 ||  abs(mcp.Vy())>210||mcp.Vz()>510 || mcp.Vz()<-1){
       std::cout<<"OUTSIDE TPC x y z ="<<mcp.Vx()<<" "<<mcp.Vy()<<" "<<mcp.Vz()<<std::endl;
-      exit(0);
+      return false;
     }
     if(abs(mcp.PdgCode()) == 2114 || abs(mcp.PdgCode()) == 2214) {
   if(ftree) FillTree(e, i, mcp.PdgCode(), true);

sbncode/SinglePhotonAnalysis/NCRadiativeResonant_module.cc

@@ -185,12 +185,12 @@ bool NCRadiativeResonant::filter(art::Event & e) {
       //CHEKC hardcode, TPC filter:
       if(abs(mcp.Vx())>210 ||  abs(mcp.Vy())>210||mcp.Vz()>510 || mcp.Vz()<-1){
       std::cout<<"OUTSIDE TPC x y z ="<<mcp.Vx()<<" "<<mcp.Vy()<<" "<<mcp.Vz()<<std::endl;
-      exit(0);
+      return false;
       }
 
       if(mcp.TrackId() != jth) {
         std::cout << "ERROR: " << __LINE__ << " " << __PRETTY_FUNCTION__ << "\nTrackId does not match index\n";
-        exit(1);
+        return false;
       }
       if(!(mcp.StatusCode() == 1 && mcp.PdgCode() == 22)) continue;//next, if this is not a photon with StatusCode 1
       exiting_photon_parents.push_back(mcp.Mother());//collect photon's parents

ups/product_deps

@@ -254,7 +254,7 @@ libdir	fq_dir		lib
 product			version		qual	flags		<table_format=2>
 genie_xsec		v3_06_00	-
 larcv2			v2_2_6		-
-larsoft			v10_20_05	-
+larsoft			v10_20_06	-
 sbnalg		        v10_20_05	-
 sbndaq_artdaq_core	v1_10_06	-
 sbndata			v01_08		-