search

jackfrost373 / LHCb_Xic_production

Honours programme analysis at MSP for MSP honours students, measuring the production ratio of Xi_c over L_c in the LHCb experiment.
2 stars 4 forks source link

Merge Little fixes #72

Closed cpawley closed 2 years ago

cpawley commented 2 years ago

This is I believe the final work of @Jonastjep - includes tuple prep script improvements, changes to plotting and calculating efficiencies

However, needs careful review and then merge conflicts handling

jackfrost373 commented 2 years ago

Does this include the new plot directories? Then I think we should merge this asap so we can continue.

There is just one conflict:

<<<<<<< littleFixes
                    dictF = open(Dict_PATH + "combinedFit_DictFile.py","w")
                    dictF.write("mainDict = " + str(combinedDict))
                    dictF.write("\ndef dictSearch(year, magPol, filename):\n\tparamArray=[]\n\tfor i,j in mainDict[year][magPol][filename].items():\n\t\tparamArray.append(j)\n\treturn paramArray")
=======
                    dictF = open(Dict_PATH + shape + "combinedFit_DictFile.py","w")
                    dictF.write("mainDict = " + str(combinedDict))
                    dictF.write("\ndef dictSearch(shape,year, magPol, filename):\n\tparamArray=[]\n\tfor i,j in mainDict[shape][year][magPol][filename].items():\n\t\tparamArray.append(j)\n\treturn paramArray")
>>>>>>> master