From b1e00086bf6929deae17f0138755e386165b00da Mon Sep 17 00:00:00 2001
From: Edward Scott <e.scott15@ic.ac.uk>
Date: Thu, 26 Jan 2017 23:49:32 +0100
Subject: [PATCH 1/7] update for (attempt at) configurable, sensor-dependent
 layer clustering

---
 SubmitHGCalPGun.py                 |  6 ++-
 edAllThreeSteps.py                 | 59 ++++++++++++++++++++++++++++++
 templates/partGun_RECO_template.py |  5 ++-
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 edAllThreeSteps.py

diff --git a/SubmitHGCalPGun.py b/SubmitHGCalPGun.py
index d2130bf8a0c50..7efa9fe1059bf 100755
--- a/SubmitHGCalPGun.py
+++ b/SubmitHGCalPGun.py
@@ -145,7 +145,8 @@ def submitHGCalProduction():
             print 'Directory '+outDir+' already exists. Exiting...'
             sys.exit()
     elif (opt.DTIER == 'RECO' or opt.DTIER == 'NTUP'):
-        outDir=opt.inDir
+        #outDir=opt.inDir
+        outDir='partGun_'+tag
         processCmd('mkdir -p '+outDir+'/cfg/')
         processCmd('mkdir -p '+outDir+'/std/')
     # prepare dir for GSD outputs locally or at EOS
@@ -154,7 +155,8 @@ def submitHGCalProduction():
         recoInputPrefix = 'file:'+currentDir+'/'+outDir+'/'+previousDataTier+'/'
     else:
         processCmd(eosExec + ' mkdir -p '+opt.eosArea+'/'+outDir+'/'+opt.DTIER+'/');
-        recoInputPrefix = 'root://eoscms.cern.ch/'+opt.eosArea+'/'+outDir+'/'+previousDataTier+'/'
+        #recoInputPrefix = 'root://eoscms.cern.ch/'+opt.eosArea+'/'+outDir+'/'+previousDataTier+'/'
+        recoInputPrefix = 'root://eoscms.cern.ch/'+opt.eosArea+'/'+opt.inDir+'/'+previousDataTier+'/'
     # determine number of jobs for GSD, in case of 'RECO'/'NTUP' only get the input GSD/RECO path
     if (opt.DTIER == 'GSD'):
         njobs = int(math.ceil(float(opt.NEVTS)/float(opt.EVTSPERJOB)))
diff --git a/edAllThreeSteps.py b/edAllThreeSteps.py
new file mode 100644
index 0000000000000..3b3a304b33824
--- /dev/null
+++ b/edAllThreeSteps.py
@@ -0,0 +1,59 @@
+#! /usr/bin/env python
+import os
+import sys
+import commands
+import time
+
+def processCmd(cmd, quite = 0):
+    status, output = commands.getstatusoutput(cmd)
+    if (status !=0 and not quite):
+        print 'Error in processing command:\n   ['+cmd+']'
+        print 'Output:\n   ['+output+'] \n'
+    return output
+
+# default is pt 35 photon, although currently require new arguments
+PDGid='22'
+PT='35'
+
+if len(sys.argv) == 3:
+    PDGid = str(sys.argv[1])
+    PT = str(sys.argv[2])
+else: sys.exit( "Wrong number of arguments: require 1. the PDGid and 2. the pT" )
+
+print "about to submit GSD jobs"
+print "PDGid = ",PDGid
+print "PT = ",PT
+os.system('./edSubmitGunImproved.sh GSD '+PDGid+' '+PT)
+
+jobstring = ''
+nJobs = ''
+while nJobs != '0':
+    print "GSD jobs still running"
+    time.sleep(60)
+    jobstring = processCmd('bjobs | grep GSD | wc -l').split('\n')
+    if len(jobstring) > 1: nJobs = jobstring[1]
+    else: nJobs = jobstring[0]
+
+print "about to submit RECO jobs"
+print "PDGid = ",PDGid
+print "PT = ",PT
+os.system('./edSubmitGunImproved.sh RECO '+PDGid+' '+PT)
+
+print "DONE - RECO jobs are submitted"
+
+jobstring = ''
+nJobs = ''
+while nJobs != '0':
+    print "RECO jobs still running"
+    time.sleep(60)
+    jobstring = processCmd('bjobs | grep RECO | wc -l').split('\n')
+    if len(jobstring) > 1: nJobs = jobstring[1]
+    else: nJobs = jobstring[0]
+
+print "about to submit NTUP jobs"
+print "PDGid = ",PDGid
+print "PT = ",PT
+os.system('./edSubmitGunImproved.sh NTUP '+PDGid+' '+PT)
+
+print ""
+print "DONE - NTUP jobs are submitted"
diff --git a/templates/partGun_RECO_template.py b/templates/partGun_RECO_template.py
index 2ff86930cb3a2..4b778de2be7fc 100644
--- a/templates/partGun_RECO_template.py
+++ b/templates/partGun_RECO_template.py
@@ -149,4 +149,7 @@
 # Customisation from command line
 process.hgcalLayerClusters.minClusters = cms.uint32(0)
 #process.hgcalLayerClusters.realSpaceCone = cms.bool(True)
-#process.hgcalLayerClusters.multiclusterRadius = cms.double(4.)
+#process.hgcalLayerClusters.multiclusterRadius = cms.double(2.)
+process.hgcalLayerClusters.dependSensor = cms.bool(True)
+process.hgcalLayerClusters.ecut = cms.double(3.)
+process.hgcalLayerClusters.kappa = cms.double(9.)

From 1e90c42ac7417d50c07e7987561de9e37a106844 Mon Sep 17 00:00:00 2001
From: Edward Scott <e.scott15@ic.ac.uk>
Date: Tue, 7 Feb 2017 13:46:28 +0100
Subject: [PATCH 2/7] cleanup and tweaks

---
 edSubmitGunImproved.sh            | 67 +++++++++++++++++++++++++++++++
 templates/partGun_GSD_template.py |  2 +
 2 files changed, 69 insertions(+)
 create mode 100755 edSubmitGunImproved.sh

diff --git a/edSubmitGunImproved.sh b/edSubmitGunImproved.sh
new file mode 100755
index 0000000000000..7531a1ccc7abe
--- /dev/null
+++ b/edSubmitGunImproved.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+#TIER="GSD"
+#TIER="RECO"
+#TIER="NTUP"
+if [ $# -ne 3 ]
+then
+  echo "ERROR - needs three arguments"
+  echo "First should be one of GSD, RECO, or NTUP"
+  echo "Second is the PDGID"
+  echo "Third is the pT"
+  exit 1
+fi
+TIER=$1
+PARTID=$2
+PT=$3
+
+NEVTS=1000
+#NEVTS=5000
+QUEUE="8nh"
+#PARTID=22
+NPART=1
+#PT=35
+
+#TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SensorDependent"
+#TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringOneEight"
+#TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringTwoTwo"
+TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringTwoSix"
+
+EOS="/eos/cms/store/group/dpg_hgcal/comm_hgcal/escott"
+
+#DATE="20160729"
+#GSDDATE="20170125"
+GSDDATE="20170207"
+
+TODAYDATE="20170207"
+
+#EXTRALABEL=""
+#EXTRALABEL="_MoreConfigurableTest"
+#EXTRALABEL="_LargerSample"
+EXTRALABEL=""
+
+
+if [ "$TIER" == "GSD" ]
+then
+  EVTSPERJOB=20
+  echo "python SubmitHGCalPGun.py --datTier $TIER --nevts $NEVTS --evtsperjob $EVTSPERJOB --queue $QUEUE --partID $PARTID --nPart $NPART --pTmin $PT --pTmax $PT --tag $TAG --eosArea $EOS"
+  #python SubmitHGCalPGun.py --datTier $TIER --nevts $NEVTS --evtsperjob $EVTSPERJOB --queue $QUEUE --partID $PARTID --nPart $NPART --pTmin $PT --pTmax $PT --tag $TAG --eosArea $EOS
+  python SubmitHGCalPGun.py --datTier $TIER --nevts $NEVTS --evtsperjob $EVTSPERJOB --queue $QUEUE --partID $PARTID --nPart $NPART --thresholdMin $PT --thresholdMax $PT --tag $TAG --eosArea $EOS
+fi
+
+
+if [ "$TIER" == "RECO" ]
+then
+  EVTSPERJOB=50
+  echo "python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG --eosArea $EOS --inDir partGun_${TAG}_$DATE"
+  python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG$EXTRALABEL --eosArea $EOS --inDir partGun_${TAG}_$GSDDATE
+fi
+
+
+if [ "$TIER" == "NTUP" ]
+then
+  EVTSPERJOB=50
+  echo "python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG --eosArea $EOS --inDir partGun_${TAG}_$DATE"
+  #python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag ${TAG}${EXTRALABEL} --eosArea $EOS --inDir partGun_${TAG}_$DATE
+  python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag ${TAG}${EXTRALABEL} --eosArea $EOS --inDir partGun_${TAG}${EXTRALABEL}_$TODAYDATE
+fi
diff --git a/templates/partGun_GSD_template.py b/templates/partGun_GSD_template.py
index 962a45c8a5349..e6c34258bb688 100644
--- a/templates/partGun_GSD_template.py
+++ b/templates/partGun_GSD_template.py
@@ -80,9 +80,11 @@
     AddAntiParticle = cms.bool(True),
     PGunParameters = cms.PSet(
         MaxEta = cms.double(3.0),
+        #MaxEta = cms.double(2.6),
         MaxPhi = cms.double(3.14159265359),
         MAXTHRESHSTRING = cms.double(DUMMYTHRESHMAX),
         MinEta = cms.double(1.479),
+        #MinEta = cms.double(2.6),
         MinPhi = cms.double(-3.14159265359),
         MINTHRESHSTRING = cms.double(DUMMYTHRESHMIN),
         PartID = cms.vint32(DUMMYIDs)

From 4d824900595c3068de29d04ea228ca2afafba84d Mon Sep 17 00:00:00 2001
From: Edward Scott <e.scott15@ic.ac.uk>
Date: Thu, 23 Feb 2017 02:13:28 +0100
Subject: [PATCH 3/7] vector for delta_c

---
 edSubmitGunImproved.sh             | 38 ++++++++++++++++++++----------
 templates/partGun_RECO_template.py |  7 ++++--
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/edSubmitGunImproved.sh b/edSubmitGunImproved.sh
index 7531a1ccc7abe..7cceed10cf1b6 100755
--- a/edSubmitGunImproved.sh
+++ b/edSubmitGunImproved.sh
@@ -22,23 +22,37 @@ QUEUE="8nh"
 NPART=1
 #PT=35
 
-#TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SensorDependent"
+TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SensorDependent"
 #TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringOneEight"
 #TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringTwoTwo"
-TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringTwoSix"
+#TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringTwoSix"
 
 EOS="/eos/cms/store/group/dpg_hgcal/comm_hgcal/escott"
 
-#DATE="20160729"
-#GSDDATE="20170125"
-GSDDATE="20170207"
+#DATE="20160729" #for "old" sample from Clemens
 
-TODAYDATE="20170207"
+GSDDATE="20170125" #for default, sensor dependent pions and photons
+#GSDDATE="20170127" #for large photon pt35 sample (same tag)
+#GSDDATE="20170207" #for photon superclustering
 
+RECODATE="20170222"
+
+#EXTRALABEL=""
+#EXTRALABEL="_FH3BH5"
+#EXTRALABEL="_FH5BH7"
+#EXTRALABEL="_FH2BH2R03"
+#EXTRALABEL="_FH3BH5R03"
+#EXTRALABEL="_FH5BH7R03"
+#EXTRALABEL="_FH5BH7R03"
+#EXTRALABEL="CorrectCartesian10mm"
+#EXTRALABEL="CorrectCartesian15mm"
+#EXTRALABEL="CorrectCartesian20mm"
+#EXTRALABEL="CorrectCartesian25mm"
+#EXTRALABEL="CorrectCartesian30mm"
+#EXTRALABEL="CorrectCartesian40mm"
+#EXTRALABEL="CorrectCartesian50mm"
+EXTRALABEL="CorrectCartesian60mm"
 #EXTRALABEL=""
-#EXTRALABEL="_MoreConfigurableTest"
-#EXTRALABEL="_LargerSample"
-EXTRALABEL=""
 
 
 if [ "$TIER" == "GSD" ]
@@ -53,7 +67,7 @@ fi
 if [ "$TIER" == "RECO" ]
 then
   EVTSPERJOB=50
-  echo "python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG --eosArea $EOS --inDir partGun_${TAG}_$DATE"
+  echo "python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG$EXTRALABEL --eosArea $EOS --inDir partGun_${TAG}_$GSDDATE"
   python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG$EXTRALABEL --eosArea $EOS --inDir partGun_${TAG}_$GSDDATE
 fi
 
@@ -61,7 +75,7 @@ fi
 if [ "$TIER" == "NTUP" ]
 then
   EVTSPERJOB=50
-  echo "python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG --eosArea $EOS --inDir partGun_${TAG}_$DATE"
+  echo "python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG${EXTRALABEL} --eosArea $EOS --inDir partGun_${TAG}${EXTRALABEL}_$RECODATE"
   #python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag ${TAG}${EXTRALABEL} --eosArea $EOS --inDir partGun_${TAG}_$DATE
-  python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag ${TAG}${EXTRALABEL} --eosArea $EOS --inDir partGun_${TAG}${EXTRALABEL}_$TODAYDATE
+  python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag ${TAG}${EXTRALABEL} --eosArea $EOS --inDir partGun_${TAG}${EXTRALABEL}_$RECODATE
 fi
diff --git a/templates/partGun_RECO_template.py b/templates/partGun_RECO_template.py
index 4b778de2be7fc..e400e175c0c46 100644
--- a/templates/partGun_RECO_template.py
+++ b/templates/partGun_RECO_template.py
@@ -148,8 +148,11 @@
 
 # Customisation from command line
 process.hgcalLayerClusters.minClusters = cms.uint32(0)
-#process.hgcalLayerClusters.realSpaceCone = cms.bool(True)
-#process.hgcalLayerClusters.multiclusterRadius = cms.double(2.)
+process.hgcalLayerClusters.realSpaceCone = cms.bool(True)
+process.hgcalLayerClusters.multiclusterRadius = cms.double(2.)
 process.hgcalLayerClusters.dependSensor = cms.bool(True)
 process.hgcalLayerClusters.ecut = cms.double(3.)
 process.hgcalLayerClusters.kappa = cms.double(9.)
+#process.hgcalLayerClusters.deltac = cms.vdouble(2.,3.,5.)
+#process.hgcalLayerClusters.deltac = cms.vdouble(2.,5.,7.)
+#process.hgcalLayerClusters.multiclusterRadius = cms.double(0.03)

From 2818413ffb964b098f2148f58902a5d41cf8ee33 Mon Sep 17 00:00:00 2001
From: Edward Scott <e.scott15@ic.ac.uk>
Date: Tue, 28 Feb 2017 17:02:43 +0100
Subject: [PATCH 4/7] tidy for PR

---
 edAllThreeSteps.py                 | 59 ----------------------
 edSubmitGunImproved.sh             | 81 ------------------------------
 templates/partGun_RECO_template.py | 10 ++--
 3 files changed, 4 insertions(+), 146 deletions(-)
 delete mode 100644 edAllThreeSteps.py
 delete mode 100755 edSubmitGunImproved.sh

diff --git a/edAllThreeSteps.py b/edAllThreeSteps.py
deleted file mode 100644
index 3b3a304b33824..0000000000000
--- a/edAllThreeSteps.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /usr/bin/env python
-import os
-import sys
-import commands
-import time
-
-def processCmd(cmd, quite = 0):
-    status, output = commands.getstatusoutput(cmd)
-    if (status !=0 and not quite):
-        print 'Error in processing command:\n   ['+cmd+']'
-        print 'Output:\n   ['+output+'] \n'
-    return output
-
-# default is pt 35 photon, although currently require new arguments
-PDGid='22'
-PT='35'
-
-if len(sys.argv) == 3:
-    PDGid = str(sys.argv[1])
-    PT = str(sys.argv[2])
-else: sys.exit( "Wrong number of arguments: require 1. the PDGid and 2. the pT" )
-
-print "about to submit GSD jobs"
-print "PDGid = ",PDGid
-print "PT = ",PT
-os.system('./edSubmitGunImproved.sh GSD '+PDGid+' '+PT)
-
-jobstring = ''
-nJobs = ''
-while nJobs != '0':
-    print "GSD jobs still running"
-    time.sleep(60)
-    jobstring = processCmd('bjobs | grep GSD | wc -l').split('\n')
-    if len(jobstring) > 1: nJobs = jobstring[1]
-    else: nJobs = jobstring[0]
-
-print "about to submit RECO jobs"
-print "PDGid = ",PDGid
-print "PT = ",PT
-os.system('./edSubmitGunImproved.sh RECO '+PDGid+' '+PT)
-
-print "DONE - RECO jobs are submitted"
-
-jobstring = ''
-nJobs = ''
-while nJobs != '0':
-    print "RECO jobs still running"
-    time.sleep(60)
-    jobstring = processCmd('bjobs | grep RECO | wc -l').split('\n')
-    if len(jobstring) > 1: nJobs = jobstring[1]
-    else: nJobs = jobstring[0]
-
-print "about to submit NTUP jobs"
-print "PDGid = ",PDGid
-print "PT = ",PT
-os.system('./edSubmitGunImproved.sh NTUP '+PDGid+' '+PT)
-
-print ""
-print "DONE - NTUP jobs are submitted"
diff --git a/edSubmitGunImproved.sh b/edSubmitGunImproved.sh
deleted file mode 100755
index 7cceed10cf1b6..0000000000000
--- a/edSubmitGunImproved.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-#TIER="GSD"
-#TIER="RECO"
-#TIER="NTUP"
-if [ $# -ne 3 ]
-then
-  echo "ERROR - needs three arguments"
-  echo "First should be one of GSD, RECO, or NTUP"
-  echo "Second is the PDGID"
-  echo "Third is the pT"
-  exit 1
-fi
-TIER=$1
-PARTID=$2
-PT=$3
-
-NEVTS=1000
-#NEVTS=5000
-QUEUE="8nh"
-#PARTID=22
-NPART=1
-#PT=35
-
-TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SensorDependent"
-#TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringOneEight"
-#TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringTwoTwo"
-#TAG="escott_PDGid${PARTID}_nPart1_Pt${PT}_SuperclusteringTwoSix"
-
-EOS="/eos/cms/store/group/dpg_hgcal/comm_hgcal/escott"
-
-#DATE="20160729" #for "old" sample from Clemens
-
-GSDDATE="20170125" #for default, sensor dependent pions and photons
-#GSDDATE="20170127" #for large photon pt35 sample (same tag)
-#GSDDATE="20170207" #for photon superclustering
-
-RECODATE="20170222"
-
-#EXTRALABEL=""
-#EXTRALABEL="_FH3BH5"
-#EXTRALABEL="_FH5BH7"
-#EXTRALABEL="_FH2BH2R03"
-#EXTRALABEL="_FH3BH5R03"
-#EXTRALABEL="_FH5BH7R03"
-#EXTRALABEL="_FH5BH7R03"
-#EXTRALABEL="CorrectCartesian10mm"
-#EXTRALABEL="CorrectCartesian15mm"
-#EXTRALABEL="CorrectCartesian20mm"
-#EXTRALABEL="CorrectCartesian25mm"
-#EXTRALABEL="CorrectCartesian30mm"
-#EXTRALABEL="CorrectCartesian40mm"
-#EXTRALABEL="CorrectCartesian50mm"
-EXTRALABEL="CorrectCartesian60mm"
-#EXTRALABEL=""
-
-
-if [ "$TIER" == "GSD" ]
-then
-  EVTSPERJOB=20
-  echo "python SubmitHGCalPGun.py --datTier $TIER --nevts $NEVTS --evtsperjob $EVTSPERJOB --queue $QUEUE --partID $PARTID --nPart $NPART --pTmin $PT --pTmax $PT --tag $TAG --eosArea $EOS"
-  #python SubmitHGCalPGun.py --datTier $TIER --nevts $NEVTS --evtsperjob $EVTSPERJOB --queue $QUEUE --partID $PARTID --nPart $NPART --pTmin $PT --pTmax $PT --tag $TAG --eosArea $EOS
-  python SubmitHGCalPGun.py --datTier $TIER --nevts $NEVTS --evtsperjob $EVTSPERJOB --queue $QUEUE --partID $PARTID --nPart $NPART --thresholdMin $PT --thresholdMax $PT --tag $TAG --eosArea $EOS
-fi
-
-
-if [ "$TIER" == "RECO" ]
-then
-  EVTSPERJOB=50
-  echo "python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG$EXTRALABEL --eosArea $EOS --inDir partGun_${TAG}_$GSDDATE"
-  python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG$EXTRALABEL --eosArea $EOS --inDir partGun_${TAG}_$GSDDATE
-fi
-
-
-if [ "$TIER" == "NTUP" ]
-then
-  EVTSPERJOB=50
-  echo "python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag $TAG${EXTRALABEL} --eosArea $EOS --inDir partGun_${TAG}${EXTRALABEL}_$RECODATE"
-  #python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag ${TAG}${EXTRALABEL} --eosArea $EOS --inDir partGun_${TAG}_$DATE
-  python SubmitHGCalPGun.py --datTier $TIER --evtsperjob $EVTSPERJOB --queue $QUEUE --tag ${TAG}${EXTRALABEL} --eosArea $EOS --inDir partGun_${TAG}${EXTRALABEL}_$RECODATE
-fi
diff --git a/templates/partGun_RECO_template.py b/templates/partGun_RECO_template.py
index e400e175c0c46..24486f3188905 100644
--- a/templates/partGun_RECO_template.py
+++ b/templates/partGun_RECO_template.py
@@ -149,10 +149,8 @@
 # Customisation from command line
 process.hgcalLayerClusters.minClusters = cms.uint32(0)
 process.hgcalLayerClusters.realSpaceCone = cms.bool(True)
-process.hgcalLayerClusters.multiclusterRadius = cms.double(2.)
+process.hgcalLayerClusters.multiclusterRadius = cms.double(2.) #in cm if realSpaceCone is true
 process.hgcalLayerClusters.dependSensor = cms.bool(True)
-process.hgcalLayerClusters.ecut = cms.double(3.)
-process.hgcalLayerClusters.kappa = cms.double(9.)
-#process.hgcalLayerClusters.deltac = cms.vdouble(2.,3.,5.)
-#process.hgcalLayerClusters.deltac = cms.vdouble(2.,5.,7.)
-#process.hgcalLayerClusters.multiclusterRadius = cms.double(0.03)
+process.hgcalLayerClusters.ecut = cms.double(3.) #multiple of sigma noise if dependSensor is true
+process.hgcalLayerClusters.kappa = cms.double(9.) #multiple of sigma noise if dependSensor is true
+#process.hgcalLayerClusters.deltac = cms.vdouble(2.,3.,5.) #specify delta c for each subdetector separately

From 4fb0c301275c3c9160c7cc16656a2f24464b307b Mon Sep 17 00:00:00 2001
From: Edward Scott <e.scott15@ic.ac.uk>
Date: Tue, 28 Feb 2017 17:18:11 +0100
Subject: [PATCH 5/7] remove some personalisation of where files are saved

---
 SubmitHGCalPGun.py                | 6 ++----
 templates/partGun_GSD_template.py | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/SubmitHGCalPGun.py b/SubmitHGCalPGun.py
index 7efa9fe1059bf..d2130bf8a0c50 100755
--- a/SubmitHGCalPGun.py
+++ b/SubmitHGCalPGun.py
@@ -145,8 +145,7 @@ def submitHGCalProduction():
             print 'Directory '+outDir+' already exists. Exiting...'
             sys.exit()
     elif (opt.DTIER == 'RECO' or opt.DTIER == 'NTUP'):
-        #outDir=opt.inDir
-        outDir='partGun_'+tag
+        outDir=opt.inDir
         processCmd('mkdir -p '+outDir+'/cfg/')
         processCmd('mkdir -p '+outDir+'/std/')
     # prepare dir for GSD outputs locally or at EOS
@@ -155,8 +154,7 @@ def submitHGCalProduction():
         recoInputPrefix = 'file:'+currentDir+'/'+outDir+'/'+previousDataTier+'/'
     else:
         processCmd(eosExec + ' mkdir -p '+opt.eosArea+'/'+outDir+'/'+opt.DTIER+'/');
-        #recoInputPrefix = 'root://eoscms.cern.ch/'+opt.eosArea+'/'+outDir+'/'+previousDataTier+'/'
-        recoInputPrefix = 'root://eoscms.cern.ch/'+opt.eosArea+'/'+opt.inDir+'/'+previousDataTier+'/'
+        recoInputPrefix = 'root://eoscms.cern.ch/'+opt.eosArea+'/'+outDir+'/'+previousDataTier+'/'
     # determine number of jobs for GSD, in case of 'RECO'/'NTUP' only get the input GSD/RECO path
     if (opt.DTIER == 'GSD'):
         njobs = int(math.ceil(float(opt.NEVTS)/float(opt.EVTSPERJOB)))
diff --git a/templates/partGun_GSD_template.py b/templates/partGun_GSD_template.py
index e6c34258bb688..962a45c8a5349 100644
--- a/templates/partGun_GSD_template.py
+++ b/templates/partGun_GSD_template.py
@@ -80,11 +80,9 @@
     AddAntiParticle = cms.bool(True),
     PGunParameters = cms.PSet(
         MaxEta = cms.double(3.0),
-        #MaxEta = cms.double(2.6),
         MaxPhi = cms.double(3.14159265359),
         MAXTHRESHSTRING = cms.double(DUMMYTHRESHMAX),
         MinEta = cms.double(1.479),
-        #MinEta = cms.double(2.6),
         MinPhi = cms.double(-3.14159265359),
         MINTHRESHSTRING = cms.double(DUMMYTHRESHMIN),
         PartID = cms.vint32(DUMMYIDs)

From 084f97dfa82383822154fb8b03770a7b225848fb Mon Sep 17 00:00:00 2001
From: Edward Scott <e.scott15@ic.ac.uk>
Date: Mon, 6 Mar 2017 00:58:01 +0100
Subject: [PATCH 6/7] update for varialbe multiclustering radius

---
 edSubmitGunImproved.sh             | 18 +++---------------
 templates/partGun_RECO_template.py |  2 +-
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/edSubmitGunImproved.sh b/edSubmitGunImproved.sh
index 7cceed10cf1b6..366f5ba17a6f8 100755
--- a/edSubmitGunImproved.sh
+++ b/edSubmitGunImproved.sh
@@ -35,23 +35,11 @@ GSDDATE="20170125" #for default, sensor dependent pions and photons
 #GSDDATE="20170127" #for large photon pt35 sample (same tag)
 #GSDDATE="20170207" #for photon superclustering
 
-RECODATE="20170222"
+RECODATE="20170305"
 
 #EXTRALABEL=""
-#EXTRALABEL="_FH3BH5"
-#EXTRALABEL="_FH5BH7"
-#EXTRALABEL="_FH2BH2R03"
-#EXTRALABEL="_FH3BH5R03"
-#EXTRALABEL="_FH5BH7R03"
-#EXTRALABEL="_FH5BH7R03"
-#EXTRALABEL="CorrectCartesian10mm"
-#EXTRALABEL="CorrectCartesian15mm"
-#EXTRALABEL="CorrectCartesian20mm"
-#EXTRALABEL="CorrectCartesian25mm"
-#EXTRALABEL="CorrectCartesian30mm"
-#EXTRALABEL="CorrectCartesian40mm"
-#EXTRALABEL="CorrectCartesian50mm"
-EXTRALABEL="CorrectCartesian60mm"
+#EXTRALABEL="UpdatedEScale_50mm"
+EXTRALABEL="UpdatedEScale_EE2FH4BH4"
 #EXTRALABEL=""
 
 
diff --git a/templates/partGun_RECO_template.py b/templates/partGun_RECO_template.py
index e400e175c0c46..5951075fde5a7 100644
--- a/templates/partGun_RECO_template.py
+++ b/templates/partGun_RECO_template.py
@@ -149,7 +149,7 @@
 # Customisation from command line
 process.hgcalLayerClusters.minClusters = cms.uint32(0)
 process.hgcalLayerClusters.realSpaceCone = cms.bool(True)
-process.hgcalLayerClusters.multiclusterRadius = cms.double(2.)
+process.hgcalLayerClusters.multiclusterRadii = cms.vdouble(2.,5.,5.)
 process.hgcalLayerClusters.dependSensor = cms.bool(True)
 process.hgcalLayerClusters.ecut = cms.double(3.)
 process.hgcalLayerClusters.kappa = cms.double(9.)

From 6bd128851062f8acf280561b3277d4a73ade0d73 Mon Sep 17 00:00:00 2001
From: Edward Scott <e.scott15@ic.ac.uk>
Date: Tue, 7 Mar 2017 10:51:53 +0100
Subject: [PATCH 7/7] update to config for KD tree multiclustering

---
 edSubmitGunImproved.sh             |  5 +++--
 templates/partGun_RECO_template.py | 14 ++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/edSubmitGunImproved.sh b/edSubmitGunImproved.sh
index 366f5ba17a6f8..499220184cfc6 100755
--- a/edSubmitGunImproved.sh
+++ b/edSubmitGunImproved.sh
@@ -35,11 +35,12 @@ GSDDATE="20170125" #for default, sensor dependent pions and photons
 #GSDDATE="20170127" #for large photon pt35 sample (same tag)
 #GSDDATE="20170207" #for photon superclustering
 
-RECODATE="20170305"
+RECODATE="20170306"
 
 #EXTRALABEL=""
 #EXTRALABEL="UpdatedEScale_50mm"
-EXTRALABEL="UpdatedEScale_EE2FH4BH4"
+#EXTRALABEL="UpdatedEScale_EE2FH4BH4"
+EXTRALABEL="_KDmultiTest_20mm"
 #EXTRALABEL=""
 
 
diff --git a/templates/partGun_RECO_template.py b/templates/partGun_RECO_template.py
index 5951075fde5a7..22282a6f6af01 100644
--- a/templates/partGun_RECO_template.py
+++ b/templates/partGun_RECO_template.py
@@ -148,11 +148,9 @@
 
 # Customisation from command line
 process.hgcalLayerClusters.minClusters = cms.uint32(0)
-process.hgcalLayerClusters.realSpaceCone = cms.bool(True)
-process.hgcalLayerClusters.multiclusterRadii = cms.vdouble(2.,5.,5.)
-process.hgcalLayerClusters.dependSensor = cms.bool(True)
-process.hgcalLayerClusters.ecut = cms.double(3.)
-process.hgcalLayerClusters.kappa = cms.double(9.)
-#process.hgcalLayerClusters.deltac = cms.vdouble(2.,3.,5.)
-#process.hgcalLayerClusters.deltac = cms.vdouble(2.,5.,7.)
-#process.hgcalLayerClusters.multiclusterRadius = cms.double(0.03)
+#those below are all now the default values - just there to illustrate what can be customised
+#process.hgcalLayerClusters.dependSensor = cms.bool(True)
+#process.hgcalLayerClusters.ecut = cms.double(3.) #multiple of sigma noise
+#process.hgcalLayerClusters.kappa = cms.double(9.) #multiple of sigma noise
+#process.hgcalLayerClusters.multiclusterRadii = cms.vdouble(2.,2.,2.) #(EE,FH,BH)
+#process.hgcalLayerClusters.deltac = cms.vdouble(2.,2.,2.) #(EE,FH,BH)