Skip to content

Commit

Permalink
remove git lfs
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisSWDavis committed May 9, 2023
1 parent 8fe9cc4 commit 93fde81
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 19 deletions.
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

26 changes: 13 additions & 13 deletions CosRayModifiedISO/internalFunctions/importingNMdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

This file was deleted.

Binary file modified CosRayModifiedISO/neutronMonitorData/OULUinputData.pkl
Binary file not shown.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 93fde81

Please sign in to comment.