Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ dependencies = [
"astropy",
"numpy",
"matplotlib",
"scipy",
"keckdrpframework"
"scipy"
]
requires-python = ">=3.9"
authors = [
Expand Down
Empty file removed src/keck_primitives/__init__.py
Empty file.
58 changes: 0 additions & 58 deletions src/keck_primitives/create_master_flat.py

This file was deleted.

14 changes: 0 additions & 14 deletions src/keck_primitives/load_flat.py

This file was deleted.

17 changes: 0 additions & 17 deletions src/keck_primitives/qa_plot.py

This file was deleted.

18 changes: 0 additions & 18 deletions src/keck_primitives/save_corrected.py

This file was deleted.

16 changes: 0 additions & 16 deletions src/keck_primitives/save_trace.py

This file was deleted.

13 changes: 0 additions & 13 deletions src/keck_primitives/trace_slits.py

This file was deleted.

15 changes: 0 additions & 15 deletions src/keck_primitives/utils.py

This file was deleted.

1 change: 0 additions & 1 deletion src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import yaml
import os
import subprocess
import time
from workflows.flows.batch_flat_flow import batch_process_all_flats

def load_config(config_path="config/config.yaml"):
Expand Down
29 changes: 10 additions & 19 deletions src/workflows/prefect_tasks/create_master_flat.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
from prefect import task
from keckdrpframework.models.arguments import Arguments
from keck_primitives.create_master_flat import CreateMasterFlat
from keck_primitives.utils import DummyAction, DummyContext
from core.flat import create_master_flat


@task(name="Create Master Flat")
Expand All @@ -27,19 +25,12 @@ def create_master_flat_task(
Returns:
Master flat correction array (multiply science data by this)
"""
args = Arguments()
args["flat_data"] = flat_data
args["method"] = "spectroscopic"

if slit_positions is not None:
args["slit_positions"] = slit_positions
args["slit_width"] = slit_width
args["n_knots_spectral"] = n_knots_spectral
args["low_signal_threshold"] = low_signal_threshold
args["edge_trim_pixels"] = edge_trim_pixels

action = DummyAction(args=args)
context = DummyContext()

result = CreateMasterFlat(action, context)._perform(args, config={})
return result["correction"]
correction = create_master_flat(
flat_data,
slit_positions=slit_positions,
slit_width=slit_width,
n_knots_spectral=n_knots_spectral,
low_signal_threshold=low_signal_threshold,
edge_trim_pixels=edge_trim_pixels
)
return correction
14 changes: 3 additions & 11 deletions src/workflows/prefect_tasks/load_flat.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
from prefect import task
from keckdrpframework.models.arguments import Arguments
from keck_primitives.load_flat import LoadFlat
from keck_primitives.utils import DummyAction, DummyContext
from core.flat import load_flat_frame


@task(name="Load Flat Frame")
def load_flat_frame_task(filepath: str):
args = Arguments()
args["filepath"] = filepath

action = DummyAction(args=args)
context = DummyContext()

result = LoadFlat(action, context)._perform(args, config={})
return result["flat_data"], result["header"]
flat_data, header = load_flat_frame(filepath)
return flat_data, header
16 changes: 3 additions & 13 deletions src/workflows/prefect_tasks/qa_plot.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
from prefect import task
from keckdrpframework.models.arguments import Arguments
from keck_primitives.qa_plot import GenerateQAPlot
from keck_primitives.utils import DummyAction, DummyContext
from core.qa import generate_qa_plot


@task(name="Generate QA Plot")
def generate_qa_plot_task(data, output_path: str, title: str = "Flat QA"):
args = Arguments()
args["data"] = data
args["output_path"] = output_path
args["title"] = title

action = DummyAction(args=args)
context = DummyContext()

result = GenerateQAPlot(action, context)._perform(args, config={})
return result["output_path"]
output_path = generate_qa_plot(data, output_path, title)
return output_path
17 changes: 3 additions & 14 deletions src/workflows/prefect_tasks/save_corrected.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
from prefect import task
from keckdrpframework.models.arguments import Arguments
from keck_primitives.save_corrected import SaveCorrectedFits
from keck_primitives.utils import DummyAction, DummyContext
from core.flat import save_corrected_fits


@task(name="Save Corrected FITS")
def save_corrected_fits_task(original_data, correction, header, output_path: str):
args = Arguments()
args["original_data"] = original_data
args["correction"] = correction
args["header"] = header
args["output_path"] = output_path

action = DummyAction(args=args)
context = DummyContext()

result = SaveCorrectedFits(action, context)._perform(args, config={})
return result["output_path"]
output_path = save_corrected_fits(original_data, correction, header, output_path)
return output_path
15 changes: 3 additions & 12 deletions src/workflows/prefect_tasks/save_trace.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
from prefect import task
from keckdrpframework.models.arguments import Arguments
from keck_primitives.save_trace import SaveTraceSolution
from keck_primitives.utils import DummyAction, DummyContext
from core.tracing import save_trace_solution


@task(name="Save Trace Solution")
def save_trace_solution_task(slit_positions, output_path: str):
args = Arguments()
args["slit_positions"] = slit_positions
args["output_path"] = output_path

action = DummyAction(args=args)
context = DummyContext()

result = SaveTraceSolution(action, context)._perform(args, config={})
return result["output_path"]
output_path = save_trace_solution(slit_positions, output_path)
return output_path
13 changes: 4 additions & 9 deletions src/workflows/prefect_tasks/trace_slits.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
from prefect import task
from keck_primitives.trace_slits import TraceSlits1D
from keckdrpframework.models.arguments import Arguments
from keck_primitives.utils import DummyAction, DummyContext
from core.tracing import trace_slits_1d


@task(name="Trace Slits 1D")
def trace_slits_task(data):
"""Task to trace slits in 1D data."""
args = Arguments()
args["flat_data"] = data
action = DummyAction(args=args)
context = DummyContext()
result = TraceSlits1D(action, context)._perform(args, config={})
return result["slit_positions"]
slit_positions = trace_slits_1d(data)
return slit_positions
Loading