Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ingesting adapt #38

Merged
merged 60 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
cfc9856
First Rebase
GillySpace27 Jun 27, 2023
b9a0239
ADAPTClient Runs
GillySpace27 Jun 29, 2023
add8b9b
Download and Format ADAPT file
GillySpace27 Jun 29, 2023
eb8e706
adapt magnetograms are downloading
GillySpace27 Jun 29, 2023
8b0cf61
punchclient with comments
GillySpace27 Jul 6, 2023
a40a8fd
remove comments and print statements
GillySpace27 Jul 6, 2023
eca9a5c
punchclient update
GillySpace27 Jul 10, 2023
4ae662b
ADAPT working through hilbert
GillySpace27 Jul 10, 2023
599c7f1
fixed plotting
GillySpace27 Jul 10, 2023
0c144fc
ADAPT Compatibility
GillySpace27 Jul 10, 2023
66e3c1d
bugfixes, ADAPT compatibility
GillySpace27 Jul 11, 2023
9b057d9
label the windplots
GillySpace27 Jul 11, 2023
86e618b
removal of PUNCHClient, see new private repo: https://github.com/Gill…
GillySpace27 Jul 11, 2023
6758fc1
added routine to compare ADAPT and HMI
GillySpace27 Jul 19, 2023
60ad751
tried making comparemag work better
GillySpace27 Jul 21, 2023
4712e07
gitignore
GillySpace27 Oct 3, 2023
dfd87df
refactored configs and tests and gitignore
GillySpace27 Oct 3, 2023
549e902
fixed following rebase. runs.
GillySpace27 Oct 4, 2023
b0d9dae
all but windplot work in both modes
GillySpace27 Oct 4, 2023
9c83887
refactored helper files
GillySpace27 Oct 4, 2023
0439bc1
moved packages deeper into fluxpipe
GillySpace27 Oct 4, 2023
966828c
conversion of fluxpipe into package
GillySpace27 Oct 4, 2023
71eafc3
update url
GillySpace27 Oct 4, 2023
dbe76e6
added config to parallel_master
GillySpace27 Oct 4, 2023
010c61c
refactoring for package
GillySpace27 Oct 4, 2023
bbaf6c4
Revert "refactoring for package"
GillySpace27 Oct 4, 2023
3a718ff
Revert "added config to parallel_master"
GillySpace27 Oct 4, 2023
ab28dc5
Revert "update url"
GillySpace27 Oct 4, 2023
ca63f8e
Revert "conversion of fluxpipe into package"
GillySpace27 Oct 4, 2023
acf36da
Revert "moved packages deeper into fluxpipe"
GillySpace27 Oct 4, 2023
949f59b
bugfix, adapt works
GillySpace27 Oct 4, 2023
7c5c82d
bugfix in parallel master
GillySpace27 Oct 4, 2023
ca986e4
rm gitignore
GillySpace27 Oct 6, 2023
9069ff9
undo testfix
GillySpace27 Oct 6, 2023
43ada6b
Moved files to fluxpipe/fluxpipe
GillySpace27 Oct 6, 2023
8290bec
deleted comments
GillySpace27 Oct 6, 2023
0878c4e
pathing compatibility
GillySpace27 Oct 6, 2023
c2a92cd
makefile and setup.py
GillySpace27 Oct 6, 2023
417d5b0
paths and comments
GillySpace27 Oct 6, 2023
60d805c
del makefile
GillySpace27 Oct 6, 2023
d985f49
added loop for adapt selection
GillySpace27 Oct 6, 2023
61e8af8
made second filespace for ADAPT
GillySpace27 Oct 7, 2023
ae8ccb1
bugfixing adapt
GillySpace27 Oct 7, 2023
09e1a4a
install guide edit
GillySpace27 Oct 7, 2023
ca9e0d7
re-added gitignore
GillySpace27 Oct 9, 2023
dcd5c09
linted everywhere but pipe_helper.py
GillySpace27 Oct 9, 2023
4d04cf6
Squashed commit of the following:
GillySpace27 Oct 9, 2023
3545843
bugfix after merge
GillySpace27 Oct 9, 2023
64b77d2
makefile does everything
GillySpace27 Oct 11, 2023
cc09914
typo
GillySpace27 Oct 11, 2023
26eca8a
errant comments
GillySpace27 Oct 11, 2023
33bde96
more packaging and installing
GillySpace27 Oct 11, 2023
c7be364
optional test config_runner after install
GillySpace27 Oct 11, 2023
a65d104
removed versioneer
GillySpace27 Oct 11, 2023
3f4d5cf
removed local versioneer and made install scripts
GillySpace27 Oct 11, 2023
467a64d
Rename of test file
lowderchris Oct 17, 2023
ea83f8f
Merge branch 'develop' into ingesting-ADAPT
lowderchris Oct 20, 2023
2648e3a
Cleanup of .gitignore
lowderchris Oct 20, 2023
23d770a
Removes generated makefiles
lowderchris Oct 23, 2023
9e7eca1
Restores some fluxpipe gitignore entries
lowderchris Oct 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
optional test config_runner after install
  • Loading branch information
GillySpace27 committed Oct 11, 2023
commit c7be364e599ebc4c2f9d5af7194ccadf2676aba9
11 changes: 6 additions & 5 deletions fluxpipe/fluxpipe/config/config.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[DEFAULT] # Specifies the default configuration section
config_name = Real_Run # Name of the configuration to be used by default
config_name = TestConfig # Name of the configuration to be used by default

jsoc_email= [email protected] # Email to use for JSOC data queries

Expand Down Expand Up @@ -41,11 +41,12 @@ adapt_select = 2 #select which ADAPT map to use (0-12)
#############################################
## Test configuration sections

[Test_Config]
batch_name = Test_config_batch
[TestConfig]
batch_name = TestConfig_batch
rotations = [2225]
fluxon_count = [1000]
adapts = [1]
fluxon_count = [100]
adapts = [0, 1]
mag_reduce = 4


[Multi_Test_Config]
Expand Down
1 change: 0 additions & 1 deletion fluxpipe/fluxpipe/helpers/pipe_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ def configurations(config_name=None, config_filename="config.ini", args=None, de
fl_prefix = os.environ.get("FL_PREFIX", "")
config_path = f"{fl_prefix}/fluxpipe/fluxpipe/config/{config_filename}"
config_path = os.path.abspath(config_path)
print(config_path, "\n\n\n")

# Search for the configuration file in the current directory and subdirectories
if not os.path.exists(config_path):
Expand Down
13 changes: 6 additions & 7 deletions fluxpipe/install-fluxpipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,10 @@ conda activate fluxenv
echo "Fluxpipe installation complete!\n\n"
echo "Remember to run 'conda activate fluxenv' before running 'python fluxpipe/fluxpipe/runners/config_runner.py'\n\n"

# read "response?Do you want to test the config_runner? (yes/no): "

# if [[ "$response" == "yes" || "$response" == "y" ]]; then
# echo "Running the file..."
# chmod +x $FL_PREFIX/fluxpipe/test/run_config.sh
# .$FL_PREFIX/fluxpipe/test/run_config.sh
# fi
read "response?Do you want to test the config_runner? ([yes]/no): "
if [[ "$response" == "yes" || "$response" == "y" || "$response" == "" ]]; then
echo "Running the file..."
cd $FL_PREFIX/fluxpipe/fluxpipe
python runners/config_runner.py
fi