From 695f27d5b1ed9d919c834c33eec8a6e6d137adfb Mon Sep 17 00:00:00 2001
From: soleti <roberto@lbl.gov>
Date: Tue, 14 Jun 2022 16:17:48 -0500
Subject: [PATCH] fixing RPC scripts

---
 JobConfig/primary/RPC.fcl         | 6 ++----
 JobConfig/primary/RPCExternal.fcl | 9 +++++++++
 JobConfig/primary/RPCInternal.fcl | 9 +++++++++
 Scripts/gen_Primary.sh            | 8 +++++---
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 JobConfig/primary/RPCExternal.fcl
 create mode 100644 JobConfig/primary/RPCInternal.fcl

diff --git a/JobConfig/primary/RPC.fcl b/JobConfig/primary/RPC.fcl
index 41834eff..4e8af2ff 100644
--- a/JobConfig/primary/RPC.fcl
+++ b/JobConfig/primary/RPC.fcl
@@ -1,5 +1,5 @@
 #
-# RPC photon spectrum, based on on Bistrilich spectrum 
+# RPC photon spectrum, based on on Bistrilich spectrum
 # Option of Internal or External to be set in driving FCL instance
 # original author: S Middleton
 #
@@ -21,6 +21,4 @@ physics.producers.generate : {
   doHistograms : true
 }
 
-physics.producers.FindMCPrimary.PrimaryProcess : @nil 
-
-
+physics.producers.FindMCPrimary.PrimaryProcess : @nil
diff --git a/JobConfig/primary/RPCExternal.fcl b/JobConfig/primary/RPCExternal.fcl
new file mode 100644
index 00000000..3a30184e
--- /dev/null
+++ b/JobConfig/primary/RPCExternal.fcl
@@ -0,0 +1,9 @@
+#
+# RPC External
+#
+
+#include "Production/JobConfig/primary/RPC.fcl"
+
+physics.producers.generate.RPCType : "mu2eExternalRPC"
+physics.producers.FindMCPrimary.PrimaryProcess : "mu2eExternalRPC"
+outputs.PrimaryOutput.fileName: "dts.owner.RPCExternal.version.sequencer.art"
diff --git a/JobConfig/primary/RPCInternal.fcl b/JobConfig/primary/RPCInternal.fcl
new file mode 100644
index 00000000..82c960e5
--- /dev/null
+++ b/JobConfig/primary/RPCInternal.fcl
@@ -0,0 +1,9 @@
+#
+# RPC Internal
+#
+
+#include "Production/JobConfig/primary/RPC.fcl"
+
+physics.producers.generate.RPCType : "mu2eInternalRPC"
+physics.producers.FindMCPrimary.PrimaryProcess : "mu2eInternalRPC"
+outputs.PrimaryOutput.fileName: "dts.owner.RPCInternal.version.sequencer.art"
diff --git a/Scripts/gen_Primary.sh b/Scripts/gen_Primary.sh
index 24902e1c..c49322f2 100755
--- a/Scripts/gen_Primary.sh
+++ b/Scripts/gen_Primary.sh
@@ -7,7 +7,7 @@
 # $2 is the production (ie MDC2020)
 # $3 is the stops production version
 # $4 is the output primary production version
-# $5 is the kind of input stops (Muminus, Muplus, IPAMuminus, IPAMuplus, or Cosmic)
+# $5 is the kind of input stops (Muminus, Muplus, IPAMuminus, IPAMuplus, Piminus, Piplus, or Cosmic)
 # $6 is the number of jobs
 # $7 is the number of events/job
 if [[ $# -lt 7 ]]; then
@@ -21,14 +21,16 @@ stype=$5
 njobs=$6
 eventsperjob=$7
 
+dataset=sim.mu2e.${stype}StopsCat.${stopsconf}.art
+
 if [[ "${stype}" == "Muminus" ]] ||  [[ "${stype}" == "Muplus" ]]; then
-  dataset=sim.mu2e.${stype}StopsCat.${stopsconf}.art
   resampler=TargetStopResampler
+elif [[ "${stype}" == "Piminus" ]] ||  [[ "${stype}" == "Piplus" ]]; then
+  resampler=TargetPiStopResampler
 elif [[ "${stype}" == "Cosmic" ]]; then
   dataset=sim.mu2e.${stype}DSStops${primary}.${stopsconf}.art   # should have Cat FIXME!
   resampler=${stype}Resampler
 else
-  dataset=sim.mu2e.${stype}StopsCat.${stopsconf}.art
   resampler=${stype}StopResampler
 fi