From d2d0699a7b038b5a872274bfb5d9a96400267b02 Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Fri, 13 Dec 2024 17:41:52 -0300 Subject: [PATCH 01/15] hello --- .gitignore | 1 + requirements.txt | 38 ++++++++++---------- src/__pycache__/caen_reader.cpython-311.pyc | Bin 0 -> 16111 bytes 3 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 .gitignore create mode 100644 src/__pycache__/caen_reader.cpython-311.pyc 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/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 0000000000000000000000000000000000000000..93ee599224d3ea80931b7181ce834ba91bb65e89 GIT binary patch literal 16111 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 Date: Thu, 16 Jan 2025 21:45:25 -0800 Subject: [PATCH 02/15] Added sumSPE1t.py --- analysis/sumSPE1t.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 15550a1b..97f428cc 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -228,7 +228,9 @@ 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 From 3c9d09ba365ebd1428eb2a2d7151cfa016179198 Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Thu, 16 Jan 2025 22:11:05 -0800 Subject: [PATCH 03/15] changing directory --- analysis/sumSPE1t.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 97f428cc..769dd6f5 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_g/WbLS-DATA/raw_root/phase3/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_f/WbLS-DATA/raw_root/phase3/muon/' allRootFiles=os.listdir(directory) inFiles=list(filter(lambda file: date in file,allRootFiles)) if not inFiles: From d7b6b4541f14d3ed8a3ea1cac74c704b9883b66a Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Thu, 16 Jan 2025 22:15:47 -0800 Subject: [PATCH 04/15] change again --- analysis/sumSPE1t.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 769dd6f5..be7e70e3 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,14 +5,14 @@ from datetime import datetime import os -directory='/media/disk_g/WbLS-DATA/raw_root/phase3/muon/' +directory='/media/disk_d/WbLS-DATA/raw_root/phase3/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_f/WbLS-DATA/raw_root/phase3/muon/' + directory='/media/disk_b/WbLS-DATA/raw_root/phase3/muon/' allRootFiles=os.listdir(directory) inFiles=list(filter(lambda file: date in file,allRootFiles)) if not inFiles: From c05206be09d193744fd6433891d4dd79d58f8cd7 Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Fri, 17 Jan 2025 09:37:44 -0800 Subject: [PATCH 05/15] change of output loc --- analysis/sumSPE1t.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index be7e70e3..6920b588 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,7 +5,7 @@ from datetime import datetime import os -directory='/media/disk_d/WbLS-DATA/raw_root/phase3/muon/' +directory='/media/disk_a/WbLS-DATA/raw_root/phase3/muon/' date=sys.argv[1] dateString=datetime.strptime(date,'%y%m%d').strftime('%d %b %Y') allRootFiles=os.listdir(directory) @@ -320,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) From a8562c7bf6e6ff6f47a21590c10416086d4635df Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:52:14 -0800 Subject: [PATCH 06/15] lol --- analysis/sumSPE1t.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 6920b588..8f88be35 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,14 +5,14 @@ from datetime import datetime import os -directory='/media/disk_a/WbLS-DATA/raw_root/phase3/muon/' +directory='/media/disk_c/WbLS-DATA/raw_root/phase3/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_b/WbLS-DATA/raw_root/phase3/muon/' + directory='/media/disk_d/WbLS-DATA/raw_root/phase3/muon/' allRootFiles=os.listdir(directory) inFiles=list(filter(lambda file: date in file,allRootFiles)) if not inFiles: @@ -230,7 +230,7 @@ def findRoi(eventMaximumTimes,peakMask=None,roiLength=40): plt.tight_layout() output_directory = '/home/darik/plots/' os.makedirs(output_directory, exist_ok=True) -plt.savefig(output_directory +date+'diagnosticplot.png') +plt.savefig(output_directory + date+'diagnosticplot.png') import pandas as pd From 232fa2139032135ed33caa65febcc62bed68268e Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Sun, 19 Jan 2025 11:46:36 -0800 Subject: [PATCH 07/15] Changing directory --- analysis/sumSPE1t.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 8f88be35..2ff626a6 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,7 +5,7 @@ from datetime import datetime import os -directory='/media/disk_c/WbLS-DATA/raw_root/phase3/muon/' +directory='/media/disk_i/WbLS-DATA/raw_root/phase7/muon' date=sys.argv[1] dateString=datetime.strptime(date,'%y%m%d').strftime('%d %b %Y') allRootFiles=os.listdir(directory) From 193ba7d1d707fe9049d0674979b1357d0fd05f48 Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Sun, 19 Jan 2025 11:55:13 -0800 Subject: [PATCH 08/15] / --- analysis/sumSPE1t.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 2ff626a6..e587f729 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,7 +5,7 @@ from datetime import datetime import os -directory='/media/disk_i/WbLS-DATA/raw_root/phase7/muon' +directory='/media/disk_i/WbLS-DATA/raw_root/phase7/muon/' date=sys.argv[1] dateString=datetime.strptime(date,'%y%m%d').strftime('%d %b %Y') allRootFiles=os.listdir(directory) From ded14b5e15278a35ef93a54481e8f92620672197 Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:13:52 -0800 Subject: [PATCH 09/15] changes --- analysis/sumSPE1t.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index e587f729..b4714df7 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -234,11 +234,11 @@ def findRoi(eventMaximumTimes,peakMask=None,roiLength=40): 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_i/WbLS-DATA/csv/phase7/bnl1t_spe_fit_results_'+date+'.csv',index=False) #file to output group histogram fit data -csvOutputFile='sumSPE_phase3.csv' +csvOutputFile='sumSPE_phase7.csv' try: df=pd.read_csv(csvOutputFile,header=[0,1],index_col=0) except FileNotFoundError: From b37fb2cce8c906a9d61f44bd80afbd7a9387019f Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:01:46 -0800 Subject: [PATCH 10/15] change in plots --- analysis/sumSPE1t.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index b4714df7..1e890c5b 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,7 +5,7 @@ from datetime import datetime import os -directory='/media/disk_i/WbLS-DATA/raw_root/phase7/muon/' +directory='/media/disk_d/WbLS-DATA/raw_root/phase5/muon/' date=sys.argv[1] dateString=datetime.strptime(date,'%y%m%d').strftime('%d %b %Y') allRootFiles=os.listdir(directory) @@ -234,11 +234,11 @@ def findRoi(eventMaximumTimes,peakMask=None,roiLength=40): import pandas as pd -pd.DataFrame(results).transpose().to_csv('/media/disk_i/WbLS-DATA/csv/phase7/bnl1t_spe_fit_results_'+date+'.csv',index=False) +pd.DataFrame(results).transpose().to_csv('/media/disk_d/WbLS-DATA/csv/phase5/bnl1t_spe_fit_results_'+date+'.csv',index=False) #file to output group histogram fit data -csvOutputFile='sumSPE_phase7.csv' +csvOutputFile='sumSPE_phase5.csv' try: df=pd.read_csv(csvOutputFile,header=[0,1],index_col=0) except FileNotFoundError: From 96e5a9be8e4947679667727bd72af8f8efab6033 Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:55:35 -0800 Subject: [PATCH 11/15] data analysis late dec --- analysis/sumSPE1t.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 1e890c5b..4b5e4b0d 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,7 +5,7 @@ from datetime import datetime import os -directory='/media/disk_d/WbLS-DATA/raw_root/phase5/muon/' +directory='/media/disk_d/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) @@ -234,11 +234,11 @@ def findRoi(eventMaximumTimes,peakMask=None,roiLength=40): import pandas as pd -pd.DataFrame(results).transpose().to_csv('/media/disk_d/WbLS-DATA/csv/phase5/bnl1t_spe_fit_results_'+date+'.csv',index=False) +pd.DataFrame(results).transpose().to_csv('/media/disk_d/WbLS-DATA/csv/phase6/bnl1t_spe_fit_results_'+date+'.csv',index=False) #file to output group histogram fit data -csvOutputFile='sumSPE_phase5.csv' +csvOutputFile='sumSPE_phase6.csv' try: df=pd.read_csv(csvOutputFile,header=[0,1],index_col=0) except FileNotFoundError: From 4cbdc07b06e48685298f7dc8240885d6be4d73aa Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Sun, 26 Jan 2025 14:44:30 -0800 Subject: [PATCH 12/15] change in disk --- analysis/sumSPE1t.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 4b5e4b0d..3bfff6c4 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,14 +5,14 @@ from datetime import datetime import os -directory='/media/disk_d/WbLS-DATA/raw_root/phase6/muon/' +directory='/media/disk_c/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_d/WbLS-DATA/raw_root/phase3/muon/' + directory='/media/disk_c/WbLS-DATA/raw_root/phase3/muon/' allRootFiles=os.listdir(directory) inFiles=list(filter(lambda file: date in file,allRootFiles)) if not inFiles: @@ -234,7 +234,7 @@ def findRoi(eventMaximumTimes,peakMask=None,roiLength=40): import pandas as pd -pd.DataFrame(results).transpose().to_csv('/media/disk_d/WbLS-DATA/csv/phase6/bnl1t_spe_fit_results_'+date+'.csv',index=False) +pd.DataFrame(results).transpose().to_csv('/media/disk_c/WbLS-DATA/csv/phase6/bnl1t_spe_fit_results_'+date+'.csv',index=False) #file to output group histogram fit data From 376a819879df22d7711bb4497c674f393c1fcce9 Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:02:53 -0800 Subject: [PATCH 13/15] new a --- analysis/sumSPE1t.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 3bfff6c4..f11f0809 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -5,14 +5,14 @@ from datetime import datetime import os -directory='/media/disk_c/WbLS-DATA/raw_root/phase6/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: From d1da56af50563e3010de12391277d0d769c3594d Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Wed, 5 Feb 2025 20:59:28 -0800 Subject: [PATCH 14/15] l --- analysis/sumSPE1t.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index f11f0809..83f2821f 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -234,7 +234,7 @@ def findRoi(eventMaximumTimes,peakMask=None,roiLength=40): import pandas as pd -pd.DataFrame(results).transpose().to_csv('/media/disk_c/WbLS-DATA/csv/phase6/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 From cc3abdb1dba632520d892a9883b55af84110b5fa Mon Sep 17 00:00:00 2001 From: dilanarik <113949454+dilanarik@users.noreply.github.com> Date: Sun, 16 Feb 2025 13:09:29 -0800 Subject: [PATCH 15/15] new_loc --- analysis/sumSPE1t.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/sumSPE1t.py b/analysis/sumSPE1t.py index 83f2821f..a4ffb6c1 100644 --- a/analysis/sumSPE1t.py +++ b/analysis/sumSPE1t.py @@ -308,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)