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

Massfitting #58

Closed Jonastjep closed 4 years ago

Jonastjep commented 4 years ago

This merge is for a fully functional fit.py and updated library functions.

Jonastjep commented 4 years ago

I think the conflict comes from the modifications @cpawley made to fit.py. I took account of these changes in my commits, so the conflicts should be benign (I only reversed one change that added the parent directory to sys.path, as this was necessary for the import of Imports.py in the program)

jackfrost373 commented 4 years ago

Seems OK afaics, please resolve the conflicts so we can merge :)

cpawley commented 4 years ago

This is OK to merge now