Skip to content

Adapting EFTFitter to netapp #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anpicci wants to merge 18 commits into
base: py3Combine
Choose a base branch
from
+174 −62
Open

Adapting EFTFitter to netapp #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
87d45c6
optimizations for the scripts
anpicci Jul 21, 2025
463c6ab
Fix typos and grammar in README
anpicci Jul 21, 2025
35414c3
Merge pull request #1 from anpicci/codex/improve-readme-documentation
anpicci Jul 21, 2025
5426a13
optimizations for the scripts
anpicci Jul 21, 2025
e18de62
Merge remote-tracking branch 'anpicci/py3Combine_anpicci' into py3Com…
anpicci Jul 21, 2025
9e0619e
Fixing afs hardcoded references in EFTFitter.py
anpicci Jul 21, 2025
78c0d3b
removing other hardcoded references to afs
anpicci Jul 21, 2025
b631467
Adding description to text2workspace.sh
anpicci Jul 21, 2025
37bad18
Removing other implicit afs references in EFTFitter
anpicci Jul 21, 2025
fe851d9
modifying the default memory for gridScan
anpicci Jul 21, 2025
f8c7a96
fixing usage of cards saved in scratch365
anpicci Jul 24, 2025
9205009
Use variable for selectedWCs path
anpicci Jul 25, 2025
f8c8ce7
Fix selectedWCs path in text2workspace
anpicci Jul 25, 2025
32082e3
Merge remote-tracking branch 'anpicci/py3Combine_anpicci' into py3Com…
anpicci Jul 25, 2025
5b93afb
custom selectedWC and making ttA optional
anpicci Jul 25, 2025
9eed6bd
Update text2workspace.sh to use directory input
anpicci Jul 25, 2025
9da6fb3
Merge branch 'py3Combine_anpicci' into codex/update-text2workspace.sh…
anpicci Jul 25, 2025
08c1580
Merge pull request #3 from anpicci/codex/update-text2workspace.sh-for…
anpicci Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Fitter/python/AnomalousCouplingEFTNegative.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,15 @@ def __init__(self):


def loadOperators(self,fpath):
print("Loading operators from {fpath}".format(fpath=fpath))
jsn = open(fpath,'r').read()
operators = json.loads(jsn)
self.alloperators = []
Copy link
Contributor

@bryates bryates Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't removing this case errors? Since self.alloperators is set below in a if block, it could be skipped. Plus, self.alloperators.extend(operators[sig]) is called there, but we're not initializing self.alloperators as a list.

print(f"Loading operators from {fpath}")
with open(fpath) as f:
operators = json.load(f)
available = set(operators)
print("\tAvailable signals:", available)
for sig in self.sgnl_known:
if sig not in available:
print(f"\tWARNING: no operators for '{sig}', skipping.")
continue
self.Operators[sig] = operators[sig]
self.numOperators[sig] = len(operators[sig])
self.alloperators.extend(operators[sig])
Expand Down
99 changes: 70 additions & 29 deletions Fitter/scripts/EFTFitter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,33 @@ def log_subprocess_output(self, pipe, level):
# if level=='info': logging.info(line.rstrip('\n'))
# if level=='err': logging.error(line.rstrip('\n'))

def __override_CMSSW_BASE(self):
"""If CMSSW_BASE points to an /afs/ path but cwd is under /users/,
Copy link
Contributor

@bryates bryates Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a nice function, but really people should be moving their CMSSW builds from /afs/. to /users/ and run scram b ProjectRename to fix the dependencies.

climb back up from cwd until you hit the CMSSW_* directory and reset CMSSW_BASE."""
cmssw_base = os.environ.get('CMSSW_BASE', '')
cwd = os.getcwd()
cmssw_dir = os.path.basename(cmssw_base)

if cmssw_base.startswith('/afs/') and cwd.startswith('/users/'):
path = cwd
# walk up until we find the CMSSW_* dir
while os.path.basename(path) != cmssw_dir and path not in ('', os.path.sep):
path = os.path.dirname(path)

if os.path.basename(path) == cmssw_dir:
cmssw_base = path

return cmssw_base

def makeWorkspaceSM(self, datacard='EFT_MultiDim_Datacard.txt'):
### Generates a workspace from a datacard ###
logging.info("Creating workspace")
if not os.path.isfile(datacard):
logging.error("Datacard does not exist!")
return
CMSSW_BASE = os.getenv('CMSSW_BASE')

CMSSW_BASE = self.__override_CMSSW_BASE()

args = ['text2workspace.py',datacard,'-P','HiggsAnalysis.CombinedLimit.PhysicsModel:multiSignalModel',
'--channel-masks',
#'--PO','map=.*/ttll:mu_ttll[1]','--PO','map=.*/tHq:mu_ttH[1,0,3]','--PO','map=.*/ttlnu:mu_ttlnu[1,0,3]','--PO','map=.*/ttH:mu_ttH[1,0,3]','--PO','map=.*/tllq:mu_tllq[1,0,3]',
Expand All @@ -177,7 +197,9 @@ def makeWorkspaceSM(self, datacard='EFT_MultiDim_Datacard.txt'):

def bestFitSM(self, name='.test', freeze=[], autoMaxPOIs=True, other=[], mask=[], mask_syst=[]):
### Multidimensional fit ###
CMSSW_BASE = os.getenv('CMSSW_BASE')

CMSSW_BASE = self.__override_CMSSW_BASE()

args=['combine','-d',CMSSW_BASE+'/src/EFTFit/Fitter/test/SMWorkspace.root','-v','2','--saveFitResult','-M','MultiDimFit','--cminPoiOnlyFit','--cminDefaultMinimizerStrategy=2']
if freeze:
params_all=['mu_ttll','mu_ttlnu','mu_ttH','mu_tllq']
Expand Down Expand Up @@ -218,7 +240,8 @@ def gridScanSM(self, name='.test', batch='', scan_params=['mu_ttll'], params_tra
### Can be used to do 2D scans as well ###
logging.info("Doing grid scan...")

CMSSW_BASE = os.getenv('CMSSW_BASE')
CMSSW_BASE = self.__override_CMSSW_BASE()

args = ['combineTool.py','-d',CMSSW_BASE+'/src/EFTFit/Fitter/test/SMWorkspace.root','-M','MultiDimFit','--algo','grid','--cminPreScan','--cminDefaultMinimizerStrategy=0']
args.extend(['--points','{}'.format(points)])
if name: args.extend(['-n','{}'.format(name)])
Expand Down Expand Up @@ -267,7 +290,9 @@ def makeWorkspaceEFT(self, datacard='EFT_MultiDim_Datacard.txt'):
if not os.path.isfile(datacard):
logging.error("Datacard does not exist!")
sys.exit()
CMSSW_BASE = os.getenv('CMSSW_BASE')

CMSSW_BASE = self.__override_CMSSW_BASE()

args = ['text2workspace.py',datacard,'-P','EFTFit.Fitter.EFTModel:eftmodel','--PO','fits='+CMSSW_BASE+'/src/EFTFit/Fitter/hist_files/EFT_Parameterization.npy','-o','EFTWorkspace.root','--channel-masks']

logging.info(' '.join(args))
Expand All @@ -279,7 +304,9 @@ def makeWorkspaceEFT(self, datacard='EFT_MultiDim_Datacard.txt'):

def bestFit(self, name='.test', params_POI=[], startValuesString='', freeze=False, autoBounds=True, other=[]):
### Multidimensional fit ###
CMSSW_BASE = os.getenv('CMSSW_BASE')

CMSSW_BASE = self.__override_CMSSW_BASE()

if params_POI == []:
params_POI = self.wcs
args=['combine','-d',CMSSW_BASE+'/src/EFTFit/Fitter/test/EFTWorkspace.root','-v','2','--saveFitResult','-M','MultiDimFit','-H','AsymptoticLimits','--cminPoiOnlyFit','--cminDefaultMinimizerStrategy=2']
Expand Down Expand Up @@ -317,7 +344,7 @@ def batchDNNScan(self, name='.test', batch='crab', points=1000000, workspace='pt
### Runs deltaNLL Scan in for a single parameter using CRAB or Condor ###
logging.info("Doing grid scan...")

CMSSW_BASE = os.getenv('CMSSW_BASE')
CMSSW_BASE = self.__override_CMSSW_BASE()

nsplit = 100 # jobs per task
jobs = points // nsplit # points per job
Expand Down Expand Up @@ -405,12 +432,18 @@ def gridScan(self, name='.test', batch='', freeze=False, scan_params=['ctW','ctZ
### Runs deltaNLL Scan in two parameters using CRAB or Condor ###
logging.info("Doing grid scan...")

CMSSW_BASE = os.getenv('CMSSW_BASE')
if not "/afs/" in workspace:
CMSSW_BASE = self.__override_CMSSW_BASE()

print(f"CMSSW_BASE after manipulation is {CMSSW_BASE}")

if not (workspace.startswith("/afs/") or workspace.startswith("/users/") or workspace.startswith("/scratch365/")):
Copy link
Contributor

@bryates bryates Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just check for a leading / instead. I know this covers the basis on glados and lxplus, but if a file system doesn't use one of these three paths it could still cause issues.

wsname = CMSSW_BASE+'/src/EFTFit/Fitter/test/'+workspace
if not os.path.exists(wsname):
print('WARNING! I was not able to find the workspace in afs, I will try finding it by assuming you passed me an absolute path')
wsname = workspace
else:
wsname = workspace

if not os.path.exists(wsname):
raise RuntimeError('Failed to find the workspace, either considering it as a local afs path or an absolute path. Please, fix it!')
print('Workspace found! I am gonna use it for running fits...')
Expand Down Expand Up @@ -476,14 +509,14 @@ def gridScan(self, name='.test', batch='', freeze=False, scan_params=['ctW','ctZ
sp.call(['mkdir', 'condor{}'.format(name)])
sp.call(['chmod', 'a+x', 'condor_{}.sh'.format(name.replace('.', ''))])
sp.call(['sed', '-i', 's/ulimit.*/&\\nunset PERL5LIB/', 'condor_{}.sh'.format(name.replace('.', ''))])
sp.call(['sed', '-i', 's/queue/\\n\\nrequestMemory=10000\\n+JobFlavour = "workday"\\n\\nqueue/', 'condor_{}.sub'.format(name.replace('.', ''))]) # Ask for at least 10GB of RAM
sp.call(['sed', '-i', 's/queue/\\n\\nrequestMemory=20000\\n+JobFlavour = "workday"\\n\\nqueue/', 'condor_{}.sub'.format(name.replace('.', ''))]) # Ask for at least 10GB of RAM

# Replace hardcoded paths with $CMSSW_BASE and dynamic paths
cmssw_base = os.getenv('CMSSW_BASE')
test_dir = os.path.join(cmssw_base, 'src', 'EFTFit', 'Fitter', 'test')
CMSSW_BASE = self.__override_CMSSW_BASE()
test_dir = os.path.join(CMSSW_BASE, 'src', 'EFTFit', 'Fitter', 'test')

sp.call(['sed', '-i',
's|executable = \(.*\)|executable = {}/src/EFTFit/Fitter/test/condor_{}.sh\\narguments = $(ProcId)|'.format(cmssw_base, name.replace('.', '')),
's|executable = \(.*\)|executable = {}/src/EFTFit/Fitter/test/condor_{}.sh\\narguments = $(ProcId)|'.format(CMSSW_BASE, name.replace('.', '')),
'condor_{}.sub'.format(name.replace('.', ''))
])

Expand Down Expand Up @@ -633,7 +666,7 @@ def retrieveGridScan(self, name='.test', batch='crab', user='apiccine'):#getpass
if os.path.isfile('condor_{}.sub'.format(name.replace('.',''))):
os.rename('condor_{}.sub'.format(name.replace('.','')),'condor{0}/condor_{0}.sub'.format(name))

def submitEFTWilks(self, name='.test', limits='/afs/crc.nd.edu/user/b/byates2/Public/wc_top22006_a24_prof_2sigma.json', workspace='ptz-lj0pt_fullR2_anatest24v01_withAutostats_withSys.root', doBest=False, asimov=False, fixed=False, wc=None, sig=0, batch='condor'):
def submitEFTWilks(self, name='.test', limits='/users/byates2/Public/wc_top22006_a24_prof_2sigma.json', workspace='ptz-lj0pt_fullR2_anatest24v01_withAutostats_withSys.root', doBest=False, asimov=False, fixed=False, wc=None, sig=0, batch='condor'):
'''
Submit jobs for GoodnessOfFit:
doBest = False - Fix all NPs to 0, run toys with seed(s) speicfied below
Expand All @@ -657,7 +690,9 @@ def submitEFTWilks(self, name='.test', limits='/afs/crc.nd.edu/user/b/byates2/Pu
if not doBest:
best = ','.join(['{}={}'.format(key,val[sig]) for key,val in limits.items() if key in self.wcs])
'''
CMSSW_BASE = os.getenv('CMSSW_BASE')

CMSSW_BASE = self.__override_CMSSW_BASE()

args = ['combineTool.py','-d',CMSSW_BASE+'/src/EFTFit/Fitter/test/'+workspace,'-M','GoodnessOfFit','--algo','saturated','--cminPreScan','--cminDefaultMinimizerStrategy=0', '--noMCbonly=1']
if not doBest:
args = ['combineTool.py','-d',CMSSW_BASE+'/src/EFTFit/Fitter/test/'+workspace,'-M','MultiDimFit','--algo', 'none', '--skipInitialFit', '--cminPreScan','--cminDefaultMinimizerStrategy=0']
Expand Down Expand Up @@ -1133,7 +1168,7 @@ def batchReductionFitEFT(self, name='.EFT.Private.Unblinded.Nov16.28redo.Float.c
eval `scramv1 runtime -sh`
cd %(PWD)s
""" % ({
'CMSSW_BASE': os.environ['CMSSW_BASE'],
'CMSSW_BASE': self.__override_CMSSW_BASE,
'SCRAM_ARCH': os.environ['SCRAM_ARCH'],
'PWD': os.environ['PWD']
})
Expand Down Expand Up @@ -1182,8 +1217,8 @@ def batchReductionFitEFT(self, name='.EFT.Private.Unblinded.Nov16.28redo.Float.c
jobs = 0
wsp_files = set()

cmssw_base = os.getenv('CMSSW_BASE')
script_dir = os.path.join(cmssw_base, 'src', 'EFTFit', 'Fitter', 'scripts')
CMSSW_BASE = self.__override_CMSSW_BASE()
script_dir = os.path.join(CMSSW_BASE, 'src', 'EFTFit', 'Fitter', 'scripts')

#for i, proc in enumerate(range(0, points, split), points // split):
for i,proc in enumerate(list(range(0,points,split)), points/split):
Expand Down Expand Up @@ -1447,6 +1482,7 @@ def ImpactInitialFit(self, workspace='ptz-lj0pt_fullR2_anatest17_noAutostats_wit
if not wcs: wcs = self.wcs
user = os.getlogin()
wcs_start = ','.join(wc+'=0' for wc in self.wcs)
CMSSW_BASE = self.__override_CMSSW_BASE()
for wc in wcs:
print('Submitting', wc)
target = 'condor_%s.sh' % wc
Expand All @@ -1455,10 +1491,10 @@ def ImpactInitialFit(self, workspace='ptz-lj0pt_fullR2_anatest17_noAutostats_wit
condorFile.write('ulimit -s unlimited\n')
condorFile.write('unset PERL5LIB\n')
condorFile.write('set -e\n')
condorFile.write('cd /afs/crc.nd.edu/user/{}/{}/CMSSW_14_1_0_pre4/src\n'.format(user[0], user))
condorFile.write('cd {}/src\n'.format(CMSSW_BASE))
condorFile.write('export SCRAM_ARCH={}\n'.format(os.environ['SCRAM_ARCH']))
condorFile.write('eval `scramv1 runtime -sh`\n')
condorFile.write('cd /afs/crc.nd.edu/user/{}/{}/CMSSW_14_1_0_pre4/src/EFTFit/Fitter/test/{}\n'.format(user[0], user, job_dir))
condorFile.write('cd {}/src/EFTFit/Fitter/test/{}\n'.format(CMSSW_BASE, job_dir))
condorFile.write('\n')
condorFile.write('if [ $1 -eq 0 ]; then\n')
condorFile.write(' combineTool.py -M Impacts -n %s%s --doInitialFit --redefineSignalPOIs %s --robustFit 1 --setParameters %s --freezeParameters ctW,ctZ,cpQM,cbW,cpQ3,cptb,cpt,cQl3i,cQlMi,cQei,ctli,ctei,ctlSi,ctlTi,cQq13,cQq83,cQq11,ctq1,cQq81,ctq8,ctt1,cQQ1,cQt8,cQt1,ctp --setParameterRanges ctW=-4,4:ctZ=-5,5:cpt=-40,30:ctp=-35,65:ctli=-10,10:ctlSi=-10,10:cQl3i=-10,10:cptb=-20,20:ctG=-2,2:cpQM=-10,30:ctlTi=-2,2:ctei=-10,10:cQei=-10,10:cQlMi=-10,10:cpQ3=-15,10:cbW=-5,5:cQq13=-1,1:cQq83=-2,2:cQq11=-2,2:ctq1=-2,2:cQq81=-5,5:ctq8=-5,5:ctt1=-5,5:cQQ1=-10,10:cQt8=-20,20:cQt1=-10,10 -m 1 -d %s' % (wc, version, wc, wcs_start, workspace))
Expand All @@ -1470,8 +1506,9 @@ def ImpactInitialFit(self, workspace='ptz-lj0pt_fullR2_anatest17_noAutostats_wit
condorFile.write('fi\n')
condorFile.close()

cmssw_base = os.getenv('CMSSW_BASE')
test_dir = os.path.join(cmssw_base, 'src', 'EFTFit', 'Fitter', 'test')
CMSSW_BASE = self.__override_CMSSW_BASE()

test_dir = os.path.join(CMSSW_BASE, 'src', 'EFTFit', 'Fitter', 'test')

target = 'condor_%s.sub' % wc
with open(target, 'w') as condorFile:
Expand Down Expand Up @@ -1509,6 +1546,9 @@ def ImpactNuisance(self, workspace='ptz-lj0pt_fullR2_anatest25v01_withAutostats_
user = os.getlogin()
ranges = ':'.join([wc+'='+','.join((str(r[0]), str(r[1]))) for wc,r in list(self.wc_ranges_differential.items()) if wc in self.wcs])
wcs_start = ','.join(wc+'=0' for wc in self.wcs)

CMSSW_BASE = self.__override_CMSSW_BASE()

for wc in wcs:
print('Submitting', wc)
if unblind:
Expand All @@ -1519,10 +1559,10 @@ def ImpactNuisance(self, workspace='ptz-lj0pt_fullR2_anatest25v01_withAutostats_
condorFile.write('ulimit -s unlimited\n')
condorFile.write('unset PERL5LIB\n')
condorFile.write('set -e\n')
condorFile.write('cd /afs/crc.nd.edu/user/{}/{}/CMSSW_14_1_0_pre4/src\n'.format(user[0], user))
condorFile.write('cd {}/src\n'.format(CMSSW_BASE))
condorFile.write('export SCRAM_ARCH={}\n'.format(os.environ['SCRAM_ARCH']))
condorFile.write('eval `scramv1 runtime -sh`\n')
condorFile.write('cd /afs/crc.nd.edu/user/{}/{}/CMSSW_14_1_0_pre4/src/EFTFit/Fitter/test/{}\n'.format(user[0], user, job_dir))
condorFile.write('cd {}/src/EFTFit/Fitter/test/{}\n'.format(CMSSW_BASE, job_dir))
condorFile.write('\n')
for i,np in enumerate(self.systematics):
condorFile.write('if [ $1 -eq {} ]; then\n'.format(i))
Expand All @@ -1539,8 +1579,7 @@ def ImpactNuisance(self, workspace='ptz-lj0pt_fullR2_anatest25v01_withAutostats_
condorFile.write('fi\n')
condorFile.close()

cmssw_base = os.getenv('CMSSW_BASE')
test_dir = os.path.join(cmssw_base, 'src', 'EFTFit', 'Fitter', 'test')
test_dir = os.path.join(CMSSW_BASE, 'src', 'EFTFit', 'Fitter', 'test')
target = 'condor_%s_fit.sub' % wc

with open(target, 'w') as condorFile:
Expand Down Expand Up @@ -1573,17 +1612,20 @@ def ImpactCollect(self, workspace='ptz-lj0pt_fullR2_anatest17_noAutostats_withSy
if not wcs: wcs = self.wcs
user = os.getlogin()
wcs_start = ','.join(wc+'=0' for wc in self.wcs)

CMSSW_BASE = self.__override_CMSSW_BASE()

for wc in wcs:
target = 'condor_%s_collect.sh' % wc
condorFile = open(target,'w')
condorFile.write('#!/bin/sh\n')
condorFile.write('ulimit -s unlimited\n')
condorFile.write('unset PERL5LIB\n')
condorFile.write('set -e\n')
condorFile.write('cd /afs/crc.nd.edu/user/{}/{}/CMSSW_14_1_0_pre4/src\n'.format(user[0], user))
condorFile.write('cd {}/src\n'.format(CMSSW_BASE))
condorFile.write('export SCRAM_ARCH={}\n'.format(os.environ['SCRAM_ARCH']))
condorFile.write('eval `scramv1 runtime -sh`\n')
condorFile.write('cd /afs/crc.nd.edu/user/{}/{}/CMSSW_14_1_0_pre4/src/EFTFit/Fitter/test/{}\n'.format(user[0], user, job_dir))
condorFile.write('cd {}/src/EFTFit/Fitter/test/{}\n'.format(CMSSW_BASE, job_dir))
condorFile.write('\n')
condorFile.write('combineTool.py -M Impacts -d %s -o impacts%s%s.json --setParameters %s -m 1 -n %s --redefineSignalPOIs %s' % (workspace, wc, version, wcs_start, wc, wc))
if unblind: print('Running over ACTUAL DATA!')
Expand All @@ -1595,8 +1637,7 @@ def ImpactCollect(self, workspace='ptz-lj0pt_fullR2_anatest17_noAutostats_withSy
condorFile.write('\nplotImpacts.py -i impacts%s%s.json -o impacts%s%s\n' % (wc, version, wc, version))
condorFile.close()

cmssw_base = os.getenv('CMSSW_BASE')
test_dir = os.path.join(cmssw_base, 'src', 'EFTFit', 'Fitter', 'test')
test_dir = os.path.join(CMSSW_BASE, 'src', 'EFTFit', 'Fitter', 'test')

target = 'condor_%s_collect.sub' % wc
with open(target, 'w') as condorFile:
Expand Down
Loading