Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
2c085dc
Added std=legacy so compiling libraries works in GCC>=8.
asreimer May 20, 2020
7bfb51f
converted most scipy to numpy. fixed issues with reading strings (byt…
asreimer May 20, 2020
c3d7dc9
Made some more changes for python 3 compatability.
asreimer May 20, 2020
df44432
Initial try at replacing flipchem, geophys, and msis with 'flipchem' …
asreimer May 20, 2020
399838c
Replaced old flipchem/msis/read_geophy code with new flipchem python …
asreimer May 21, 2020
abe8c50
Fixing error bars and initial guess on alternating code fitting
asreimer Jul 28, 2020
99b5dca
Removed unused code
asreimer Nov 19, 2021
1e37c04
updated Makefile to remove unused things and fix line separator
asreimer Nov 19, 2021
aaffb07
removing unused config files
asreimer Nov 20, 2021
201d3d6
removing unused config files
asreimer Nov 20, 2021
79f69ef
removed unused code, some formatting fixes, dependency pruning
asreimer Nov 20, 2021
af079ab
more formatting, cleaning up code
asreimer Nov 20, 2021
7f8183f
more formatting, cleaning up code
asreimer Nov 20, 2021
4aaee02
formatting, use numpy.pi to be consistent
asreimer Nov 20, 2021
3fc9d5c
formatting, use numpy instead of scipy
asreimer Nov 20, 2021
6b16c21
removed variables that aren't used.
asreimer Nov 20, 2021
da2be2c
removed geolib, replaced with pymap3d and apexpy, modified /Geomag to…
asreimer Nov 21, 2021
2e45760
removing unused imports, using numpy for numpy things
asreimer Nov 21, 2021
6a19fd9
Changed names of k-vector components, derived legacy equivalent k-vec…
asreimer Nov 23, 2021
63f9668
minor formatting
asreimer Nov 23, 2021
3ecf170
adding python dependency version information to fitted files
asreimer Nov 23, 2021
0584489
update version number
asreimer Nov 23, 2021
b2f7fe9
removing unused code and restructuring.
asreimer Nov 23, 2021
6fce6f9
removing more files, updating readme
asreimer Nov 23, 2021
2379530
delete file
asreimer Nov 23, 2021
b0c763b
change directory name
asreimer Nov 23, 2021
858f7e3
Merge pull request #1 from amisr/enh_py3
asreimer Nov 23, 2021
fd19941
cleaning up the code, adding changes from dd7f14cdf47ab5a9f8c6d9d5005…
asreimer Nov 23, 2021
2f33667
resolving merge conflicts
asreimer Nov 23, 2021
1756bab
adding zenodo.json config
asreimer Nov 23, 2021
62f7c0d
Adding documentation templates and some documentation
asreimer Nov 23, 2021
61e0d24
pymap3d doesn't have __version__
asreimer Nov 23, 2021
5302815
requirements not needed yet, package not pip installable
asreimer Nov 23, 2021
01fbbbc
requirements not needed yet, package not pip installable
asreimer Nov 23, 2021
4ab0c41
requirements not needed yet, package not pip installable
asreimer Nov 23, 2021
8c9a151
dev notes about usage of apexpy
asreimer Nov 23, 2021
07ae3b0
update docs
asreimer Nov 23, 2021
de425ee
swig wrapper
asreimer Nov 24, 2021
ad168d8
moving spec worker
asreimer Nov 24, 2021
f8a00ba
changes made to properly wrap spec worker
asreimer Nov 24, 2021
18a3734
use wrapped spec worker instead of ctypes
asreimer Nov 24, 2021
d62761d
refactoring for packaging
asreimer Nov 24, 2021
3026a36
refactoring and other changes needed for packaging
asreimer Nov 24, 2021
dc5f28a
modifying scripts to use command line 'run_fitter' from package install
asreimer Nov 24, 2021
46efe5a
changing names of apex kvector components, fixing incorrect kpn defin…
asreimer Nov 24, 2021
b7a6ca3
Changing version number convention to semanitc
asreimer Nov 25, 2021
31cf60e
Combining several config files into one, replacing several config fil…
asreimer Nov 25, 2021
7851322
user no longer needs to provide path to config file that contains all…
asreimer Nov 25, 2021
f87d0c0
removing unused function
asreimer Nov 25, 2021
88711e3
updating definition
asreimer Nov 25, 2021
fc74455
pip install instructions
asreimer Nov 25, 2021
cab9bdc
Updated shell scripts that help run the fitter
asreimer Nov 25, 2021
7b0e6e1
adding example config files
asreimer Nov 25, 2021
d0dd725
__version__ moved, so fixing
asreimer Nov 25, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
21 changes: 21 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
version: 2

formats:
- epub
- pdf

build:
image: latest

python:
version: 3.7
# install:
# - method: pip
# path: .
# - requirements: requirements.txt
# system_packages: true

sphinx:
builder: html
configuration: docs/conf.py
fail_on_warning: true
26 changes: 26 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"license": {
"id": "GPL-v3.0"
},
"notes": "When referencing this package, please cite the package DOI, the apexpy (10.5281/zenodo.1214206), flipchem (doi:10.5281/zenodo.3688853), and pymap3d (doi:10.5281/zenodo.595430).",
"keywords": [
"Fitting Algorithm",
"Ionosphere",
"MSIS",
"AMISR",
"Incoherent Scatter Radar",
"Collective Thomson Scatter",
"Space Physics",
"Heliophysics"
],
"creators": [
{
"orcid": "0000-0001-8267-6327",
"name": "Michael Nicolls",
}
{
"orcid": "0000-0002-4621-3453",
"name": "Ashton S. Reimer"
},
]
}
24 changes: 24 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
overspread
==========
This is the production version of the E and F region lagged product fitting software for the AMISRs. This work was supported by the National Science Foundation under cooperative agreement AGS–1840962.


Overview
--------
Lorem Ipsum


Quick Start
-----------
Lorem Ipsum


Documentation
-------------
You can find more detailed documentation, including installation guides for macOS and Linux here: https://overspread.readthedocs.io



References
----------
Lorem Ipsum
7 changes: 7 additions & 0 deletions bin/example_config_exp.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[DEFAULT]
YR = 2020/03
DATAPATH = /path/to/rawfiles/20200324.010
EXPDIR = MSWinds27H.v03
EXPNAME = 20200324.010
beamMapScaleFile = /path/to/cal-202003-calibration-ksys-03.21.2020.txt

30 changes: 30 additions & 0 deletions bin/example_config_fit_ACfl.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[DEFAULT]
INTEG = 10min

[FIT_OPTIONS]
DO_FITS = 1
Recs2integrate = 60*10
PERTURBATION_NOISE = 1
procMedian = 1
p_N0 = 1.0e11
p_T0 = 1000.00
p_M0 = 16.0
SUMMATION_RULE = [[scipy.zeros(48),scipy.zeros(48)],[scipy.zeros(48)-1,scipy.zeros(48)],[scipy.zeros(48)-2,scipy.zeros(48)+1],[scipy.zeros(48)-4,scipy.zeros(48)+3]]
fit0lag = 1 # whether to fit the 0 lag
uselag1 = 1 # for density
htmin = 80e3
htmax = 350e3
Ngroup = 4
NION = 5
molecularModel = 1
mi = [16.0,32.0,30.0,28.0,14.0]
GroupHt = [120e3,150e3,200e3,htmax]
Ifit = [
[[-1,1,-2,1],[-2,-1,-2,-1],[-2,-1,-2,-1],[-2,-1,-2,-1],[-2,-1,-2,-1],[0,1,-2,-1]],
[[-1,1,-2,1],[-2,-1,-2,-1],[-2,-1,-2,-1],[-2,-1,-2,-1],[-2,-1,-2,-1],[0,1,-2,-1]],
[[-1,1,-2,1],[-2,-1,-2,-1],[-2,-1,-2,-1],[-2,-1,-2,-1],[-2,-1,-2,-1],[0,1,-2,-1]],
[[-1,1,-2,1],[-2,-1,-2,-1],[-2,-1,-2,-1],[-2,-1,-2,-1],[-2,-1,-2,-1],[0,1,-2,-1]]
]
beamMapScale = 1
fitcal = 1

38 changes: 38 additions & 0 deletions bin/example_config_io_ACfl.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This config file for I/O stuff, will vary from experiment to experiment

[DEFAULT]

ADDIT=
OUTPUT_DAT_PATH=/path/to/output/directory/

[INPUT]
# Path to input filelist
FILELIST=%(OUTPUT_DAT_PATH)s/%(YR)s/%(EXPDIR)s/%(EXPNAME)s/filelist_AC.txt

# Path to files in filelist (if not absolute path)
FILE_PATH=%(DATAPATH)s

# Path to file containing lag ambiguity function
#AMB_PATH = /path/to/AmbFunc.h5

[OUTPUT]

# Output path
OUTPUT_PATH=%(OUTPUT_DAT_PATH)s/%(YR)s/%(EXPDIR)s/%(EXPNAME)s

# Output filename
OUTPUT_NAME=%(OUTPUT_PATH)s/%(EXPNAME)s_ac_%(INTEG)s%(ADDIT)s.h5

proc_funcname=process_altcode
h5DataPath=/IncohCodeFl/Data

# 0 - none, 1 - fitted plots, 2 - fitted plots and iteration plots
plotson=2
nplots=1

plotfrac=1

plotsdir=%(OUTPUT_PATH)s/plots_ac_%(INTEG)s%(ADDIT)s
saveplots=1

xlims=[(0.01,10),(0,4),(-5,5)]
File renamed without changes.
File renamed without changes.
27 changes: 27 additions & 0 deletions bin/run_AC.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/sh

FIT_CONFIG='config_fit_ACfl.ini'
IO_CONFIG='config_io_ACfl.ini'

if [ $# -gt 4 ] || [ $# -eq 0 ]; then
echo 1>&2 Usage: $0 RADAR EXPERIMENT [FIT_CONFIG] [IO_CONFIG]
echo 1>&2 Valid RADAR: pfisr, risrn, risrc, sondre
exit 127
fi

if [ $# -eq 3 ]; then
FIT_CONFIG=$3
fi
if [ $# -eq 2 ]; then
FIT_CONFIG=$3
IO_CONFIG=$4
fi

# configuration files
configfiles="$FIT_CONFIG,$IO_CONFIG" # fit and io config files
configexp="$2/config_exp.ini" # experiment specific config file(s)

# run the fitter
command="run_fitter $1 -c $configfiles,$configexp"
echo $command
$command
27 changes: 27 additions & 0 deletions bin/run_LP.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/sh

FIT_CONFIG='config_fit_LP.ini'
IO_CONFIG='config_io_LP.ini'

if [ $# -gt 4 ] || [ $# -eq 0 ]; then
echo 1>&2 Usage: $0 RADAR EXPERIMENT [FIT_CONFIG] [IO_CONFIG]
echo 1>&2 Valid RADAR: pfisr, risrn, risrc, sondre
exit 127
fi

if [ $# -eq 3 ]; then
FIT_CONFIG=$3
fi
if [ $# -eq 2 ]; then
FIT_CONFIG=$3
IO_CONFIG=$4
fi

# configuration files
configfiles="$FIT_CONFIG,$IO_CONFIG" # fit and io config files
configexp="$2/config_exp.ini" # experiment specific config file(s)

# run the fitter
command="run_fitter $1 -c $configfiles,$configexp"
echo $command
$command
12 changes: 0 additions & 12 deletions calibration_scalars/PFISR/200903/BeamCodeMap1.txt

This file was deleted.

Loading