RussLaher
commented
9 months ago I corrected user.name and user.email in branch feature/master_pipeline_upgrade_20231128 using the commands below:
HOPE I GOT IT RIGHT.
laher [Tue Dec 05 04:59:34] [~/Documents/kpf/kpfpipeline] $ git config --global user.name "Russ Laher" laher [Tue Dec 05 04:59:43] [~/Documents/kpf/kpfpipeline] $ git config --global user.email laher@ipac.caltech.edu laher [Tue Dec 05 05:00:10] [~/Documents/kpf/kpfpipeline] $ laher [Tue Dec 05 05:00:12] [~/Documents/kpf/kpfpipeline] $ laher [Tue Dec 05 05:00:12] [~/Documents/kpf/kpfpipeline] $ git config --list credential.helper=osxkeychain init.defaultbranch=main user.name=Russ Laher user.email=laher@ipac.caltech.edu
laher [Tue Dec 05 05:00:30] [~/Documents/kpf/kpfpipeline] $ git checkout feature/master_pipeline_upgrade_20231128 M configs/quality_control_exposure.cfg M database/schema/kpfOpsTables.sql Switched to branch 'feature/master_pipeline_upgrade_20231128' Your branch is behind 'origin/feature/master_pipeline_upgrade_20231128' by 86 commits, and can be fast-forwarded. (use "git pull" to update your local branch) laher [Tue Dec 05 05:01:37] [~/Documents/kpf/kpfpipeline] $ git commit --amend --reset-author [feature/master_pipeline_upgrade_20231128 f7b9edd9] Modified to write intermediate products to /data/masters/pool instead of /testdata . Modified arclamp-stack framework to query database for fallback input master callibration files, if necessary. Made efficiency improvements for searching FITS headers for inputs to arclamp-stack framework. 10 files changed, 356 insertions(+), 181 deletions(-) laher [Tue Dec 05 05:02:29] [~/Documents/kpf/kpfpipeline] $ git push --set-upstream origin feature/master_pipeline_upgrade_20231128 To https://github.com/California-Planet-Search/KPF-Pipeline.git ! [rejected] feature/master_pipeline_upgrade_20231128 -> feature/master_pipeline_upgrade_20231128 (non-fast-forward) error: failed to push some refs to 'https://github.com/California-Planet-Search/KPF-Pipeline.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. laher [Tue Dec 05 05:02:47] [~/Documents/kpf/kpfpipeline] $ git pull Merge made by the 'ort' strategy. AWH_notebooks/QC Example - L0 Data Products Check.ipynb | 97 ++++++++++ README.md | 2 +- configs/kpf_drp.cfg | 1 + configs/quality_control_example.cfg | 20 +- configs/quicklook_match.cfg | 2 +- configs/write_headers_match_files.cfg | 15 ++ docs/source/analysis/dictonary_format.rst | 2 + docs/source/develop/QC_ExampleDeveloping_a_QC_Method.ipynb | 268 +++++++++++++++++++++++++++ docs/source/develop/QC_ExampleL0_Data_Products_Check.ipynb | 97 ++++++++++ docs/source/develop/start.rst | 22 ++- docs/source/info/KPF_L1_SNR.png | Bin 0 -> 2108613 bytes docs/source/info/dark_current_example.png | Bin 0 -> 1506639 bytes docs/source/info/data_format.rst | 165 ++++++++++++++++- modules/Utils/analyze_2d.py | 31 ++-- modules/Utils/analyze_em.py | 5 +- modules/Utils/kpf_parse.py | 21 +-- modules/Utils/string_proc.py | 34 ++++ modules/quality_control/configs/default.cfg | 2 +- modules/quality_control/src/quality_control.py | 412 +++++++++++++++++++++++++---------------- modules/quality_control/src/quality_control_framework.py | 76 ++++---- modules/quality_control_exposure/src/quality_control_exposure_framework.py | 19 +- modules/quicklook/src/alg.py | 10 +- modules/quicklook/src/diagnostics.py | 97 ++++++++++ modules/quicklook/src/diagnostics_framework.py | 86 +++++++++ recipes/kpf_drp.recipe | 77 +++++--- recipes/qc_tests.subrecipe | 19 ++ recipes/quality_control_example.recipe | 19 +- recipes/watchfor_kpf_l0.recipe | 24 ++- recipes/write_headers_match_files.recipe | 54 ++++++ scripts/kpf_processing_progress.py | 382 ++++++++++++++++++++++++++++++++++++++ scripts/kpf_processing_progress.sh | 296 +++++++++++++++++++++++++++++ 31 files changed, 2050 insertions(+), 305 deletions(-) create mode 100644 AWH_notebooks/QC Example - L0 Data Products Check.ipynb create mode 100644 configs/write_headers_match_files.cfg create mode 100644 docs/source/develop/QC_ExampleDeveloping_a_QC_Method.ipynb create mode 100644 docs/source/develop/QC_ExampleL0_Data_Products_Check.ipynb create mode 100644 docs/source/info/KPF_L1_SNR.png create mode 100644 docs/source/info/dark_current_example.png create mode 100644 modules/quicklook/src/diagnostics.py create mode 100644 modules/quicklook/src/diagnostics_framework.py create mode 100644 recipes/qc_tests.subrecipe create mode 100644 recipes/write_headers_match_files.recipe create mode 100755 scripts/kpf_processing_progress.py create mode 100755 scripts/kpf_processing_progress.sh laher [Tue Dec 05 05:03:22] [~/Documents/kpf/kpfpipeline] $ git push Enumerating objects: 17, done. Counting objects: 100% (17/17), done. Delta compression using up to 4 threads Compressing objects: 100% (7/7), done. Writing objects: 100% (7/7), 1.08 KiB | 1.08 MiB/s, done. Total 7 (delta 5), reused 0 (delta 0), pack-reused 0 remote: Resolving deltas: 100% (5/5), completed with 5 local objects. remote: This repository moved. Please use the new location: remote: https://github.com/Keck-DataReductionPipelines/KPF-Pipeline.git remote: remote: GitHub found 2 vulnerabilities on Keck-DataReductionPipelines/KPF-Pipeline's default branch (2 moderate). To find out more, visit: remote: https://github.com/Keck-DataReductionPipelines/KPF-Pipeline/security/dependabot remote: To https://github.com/California-Planet-Search/KPF-Pipeline.git 5d604b53..556c13bd feature/master_pipeline_upgrade_20231128 -> feature/master_pipeline_upgrade_20231128 laher [Tue Dec 05 05:03:40] [~/Documents/kpf/kpfpipeline] $ laher [Tue Dec 05 05:03:50] [~/Documents/kpf/kpfpipeline] $ laher [Tue Dec 05 05:03:51] [~/Documents/kpf/kpfpipeline] $ laher [Tue Dec 05 05:03:51] [~/Documents/kpf/kpfpipeline] $ laher [Tue Dec 05 05:03:51] [~/Documents/kpf/kpfpipeline] $ git push --set-upstream origin feature/master_pipeline_upgrade_20231128 branch 'feature/master_pipeline_upgrade_20231128' set up to track 'origin/feature/master_pipeline_upgrade_20231128'. Everything up-to-date
Please merge the feature/master_pipeline_upgrade_20231128 branch into the develop branch.