diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 17fab86..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -CosRayModifiedISO/neutronMonitorData/OULU_1964_04_01[[:space:]]_00_00_2021_01_31[[:space:]]_00_00.dat filter=lfs diff=lfs merge=lfs -text -CosRayModifiedISO/neutronMonitorData/OULUinputData.pkl filter=lfs diff=lfs merge=lfs -text diff --git a/CosRayModifiedISO/internalFunctions/importingNMdata.py b/CosRayModifiedISO/internalFunctions/importingNMdata.py index 079ea7e..2be7aa3 100644 --- a/CosRayModifiedISO/internalFunctions/importingNMdata.py +++ b/CosRayModifiedISO/internalFunctions/importingNMdata.py @@ -10,25 +10,25 @@ def readInOULUdata()->pd.DataFrame: inputPKLfile = files('CosRayModifiedISO.neutronMonitorData').joinpath('OULUinputData.pkl') - inputOULUDATfile = files('CosRayModifiedISO.neutronMonitorData').joinpath('OULU_1964_04_01 _00_00_2021_01_31 _00_00.dat') + #inputOULUDATfile = files('CosRayModifiedISO.neutronMonitorData').joinpath('OULU_1964_04_01 _00_00_2021_01_31 _00_00.dat') - if not os.path.isfile(inputPKLfile): + # if not os.path.isfile(inputPKLfile): - inputDF = pd.read_csv(inputOULUDATfile, - skiprows=22, header=None, skipfooter=3, delimiter=" ") - inputDF.drop(6,axis=1,inplace=True) - inputDF.columns = ["date", "time", "fractional year", "uncorrected counts / min", "corrected counts / min", "barometric pressure (mbar)"] - inputDF["datetime"] = (inputDF["date"]+" " + inputDF["time"]).apply(lambda row:dt.datetime.strptime(row,"%Y.%m.%d %H:%M:%S")) + # inputDF = pd.read_csv(inputOULUDATfile, + # skiprows=22, header=None, skipfooter=3, delimiter=" ") + # inputDF.drop(6,axis=1,inplace=True) + # inputDF.columns = ["date", "time", "fractional year", "uncorrected counts / min", "corrected counts / min", "barometric pressure (mbar)"] + # inputDF["datetime"] = (inputDF["date"]+" " + inputDF["time"]).apply(lambda row:dt.datetime.strptime(row,"%Y.%m.%d %H:%M:%S")) - outputDF = inputDF[["datetime","corrected counts / min"]] + # outputDF = inputDF[["datetime","corrected counts / min"]] - with open(inputPKLfile,"wb") as OULUPKLfile: - pkl.dump(outputDF,OULUPKLfile) + # with open(inputPKLfile,"wb") as OULUPKLfile: + # pkl.dump(outputDF,OULUPKLfile) - else: + # else: - with open(inputPKLfile,"rb") as OULUPKLfile: - outputDF = pkl.load(OULUPKLfile) + with open(inputPKLfile,"rb") as OULUPKLfile: + outputDF = pkl.load(OULUPKLfile) return outputDF diff --git a/CosRayModifiedISO/neutronMonitorData/OULU_1964_04_01 _00_00_2021_01_31 _00_00.dat b/CosRayModifiedISO/neutronMonitorData/OULU_1964_04_01 _00_00_2021_01_31 _00_00.dat deleted file mode 100755 index 67faa85..0000000 --- a/CosRayModifiedISO/neutronMonitorData/OULU_1964_04_01 _00_00_2021_01_31 _00_00.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a3496fe7b4cc2c982cc724d11145d2218bf32149827cc0787f1fda84338b915 -size 285931562 diff --git a/CosRayModifiedISO/neutronMonitorData/OULUinputData.pkl b/CosRayModifiedISO/neutronMonitorData/OULUinputData.pkl index e3f95f9..e4aae9c 100644 Binary files a/CosRayModifiedISO/neutronMonitorData/OULUinputData.pkl and b/CosRayModifiedISO/neutronMonitorData/OULUinputData.pkl differ diff --git a/setup.py b/setup.py index 95e7fa7..acf961d 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ packages=find_packages(), package_data={"":["CosRayModifiedISO/neutronMonitorData/*.dat","CosRayModifiedISO/neutronMonitorData/*.pkl"]}, include_package_data=True, - version='1.1', + version='1.2', url="https://github.com/ssc-maire/CosRayModifiedISO", author='Chris S. W. Davis', author_email='ChrisSWDavis@gmail.com',