diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..8fa5b33d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +env \ No newline at end of file diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 15550a1b..a4ffb6c1 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,14 +5,14 @@ from datetime import datetime import os -directory='/media/disk_e/WbLS-DATA/raw_root/phase3/muon/' +directory='/media/disk_a/WbLS-DATA/raw_root/phase6/muon/' date=sys.argv[1] dateString=datetime.strptime(date,'%y%m%d').strftime('%d %b %Y') allRootFiles=os.listdir(directory) inFiles=list(filter(lambda file: date in file,allRootFiles)) if not inFiles: - directory='/media/disk_c/WbLS-DATA/raw_root/phase3/muon/' + directory='/media/disk_a/WbLS-DATA/raw_root/phase7/muon/' allRootFiles=os.listdir(directory) inFiles=list(filter(lambda file: date in file,allRootFiles)) if not inFiles: @@ -228,15 +228,17 @@ def findRoi(eventMaximumTimes,peakMask=None,roiLength=40): plt.yscale('log') plt.tight_layout() -plt.savefig('diagnostics/1t/'+date+'diagnosticplot.png') +output_directory = '/home/darik/plots/' +os.makedirs(output_directory, exist_ok=True) +plt.savefig(output_directory + date+'diagnosticplot.png') import pandas as pd -pd.DataFrame(results).transpose().to_csv('/media/disk_e/WbLS-DATA/csv/phase3/bnl1t_spe_fit_results_'+date+'.csv',index=False) +pd.DataFrame(results).transpose().to_csv('/media/disk_a/WbLS-DATA/csv/phase6/bnl1t_spe_fit_results_'+date+'.csv',index=False) #file to output group histogram fit data -csvOutputFile='sumSPE_phase3.csv' +csvOutputFile='sumSPE_phase6.csv' try: df=pd.read_csv(csvOutputFile,header=[0,1],index_col=0) except FileNotFoundError: @@ -306,9 +308,9 @@ def findRoi(eventMaximumTimes,peakMask=None,roiLength=40): #hist995=np.sort(total)[math.floor(0.995*len(total))] #hist990=np.sort(total)[math.floor(0.99*len(total))] - df.at[date,(group,'mean')]=popt[0] - df.at[date,(group,'max')]=hist999 - df.at[date,(group,'meanErr')]=meanErr + df.loc[date,(group,'mean')]=popt[0] + df.loc[date,(group,'max')]=hist999 + df.loc[date,(group,'meanErr')]=meanErr #plot fitted data a=np.linspace(poptInit[0]-(histRange/8),poptInit[0]+(histRange/8),350) @@ -318,6 +320,6 @@ def findRoi(eventMaximumTimes,peakMask=None,roiLength=40): df.to_csv(csvOutputFile) plt.tight_layout() -plt.savefig('ly_diagnostics/'+date+'LYplot.png',format='png') +plt.savefig(output_directory+date+'LYplot.png',format='png') print('done with {}'.format(dateString)) exit(1) diff --git a/requirements.txt b/requirements.txt index 911f3250..c8d27392 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,25 +1,25 @@ -awkward==1.7.0 -click==8.0.3 +pip-install==1.3.5 +awkward==2.2.0 +click==8.1.3 cycler==0.11.0 -fonttools==4.28.5 -install==1.3.5 -kiwisolver==1.3.2 -matplotlib==3.5.1 +fonttools==4.38.0 +kiwisolver==1.4.4 +matplotlib==3.6.2 mypy-extensions==0.4.3 -numpy==1.22.1 +numpy==1.23.5 packaging==21.3 -pathspec==0.9.0 -Pillow==9.0.0 -platformdirs==2.4.1 -pyparsing==3.0.6 +pathspec==0.11.1 +Pillow==9.4.0 +platformdirs==2.5.4 +pyparsing==3.0.9 python-dateutil==2.8.2 PyYAML==6.0 -scipy==1.7.3 +scipy==1.10.0 six==1.16.0 -tomli==2.0.0 -typing_extensions==4.0.1 -uproot==4.1.9 -ipympl==0.9.1 -lazydocs-0.4.8 -pandas-1.4.3 -numba-0.56.0 +tomli==2.0.1 +typing_extensions==4.4.0 +uproot==5.0.2 +ipympl==0.9.3 +lazydocs==0.4.8 +pandas==1.5.2 +numba==0.57.0 diff --git a/src/__pycache__/caen_reader.cpython-311.pyc b/src/__pycache__/caen_reader.cpython-311.pyc new file mode 100644 index 00000000..93ee5992 Binary files /dev/null and b/src/__pycache__/caen_reader.cpython-311.pyc differ