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

Improve EDPS workflow installation #50

Merged
merged 7 commits into from
Oct 31, 2024
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
4 changes: 2 additions & 2 deletions metisp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ ACLOCAL_AMFLAGS = -I m4
DISTCLEANFILES = *~


SUBDIRS = irplib hdrl metis recipes pymetis pyrecipes reflex regtests
DIST_SUBDIRS = irplib hdrl metis recipes pymetis pyrecipes reflex regtests
SUBDIRS = irplib hdrl metis recipes pymetis pyrecipes reflex workflows regtests
DIST_SUBDIRS = irplib hdrl metis recipes pymetis pyrecipes reflex workflows regtests

DOXYGEN_SUBDIRS =
PYTHON_SUBDIRS = pymetis
Expand Down
13 changes: 13 additions & 0 deletions metisp/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
# METIS Pipeline
METIS pipe line is the data reduction software for ELT early science instrument of Mid-IR imager and spectrograph.

## Installation

```
cd metisp
./bootstrap
./configure --prefix=/tmp/wherever
make
make python
make install
make install-python
```


## Path Setting

Including the following two line in your .bashrc
Expand Down
10 changes: 10 additions & 0 deletions metisp/acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,22 @@ AC_DEFUN([METIS_SET_PATHS],
wkfcopydir='${datadir}/reflex/workflows/${PACKAGE}-${VERSION}'
fi

if test -z "$workflowdir"; then
workflowdir='${datadir}/esopipes/workflows/${PACKAGE}-${VERSION}/${PACKAGE}'
fi

if test -z "$reportsdir"; then
reportsdir='${datadir}/esopipes/reports/${PACKAGE}-${VERSION}'
fi


AC_SUBST(plugindir)
AC_SUBST(privatelibdir)
AC_SUBST(apidocdir)
AC_SUBST(pipedocsdir)
AC_SUBST(configdir)
AC_SUBST(wkfextradir)
AC_SUBST(workflowdir)
AC_SUBST(wkfcopydir)


Expand Down
1 change: 1 addition & 0 deletions metisp/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ AC_CONFIG_FILES(Makefile
pyrecipes/Makefile
irplib/Makefile
irplib/tests/Makefile
workflows/Makefile
reflex/Makefile
reflex/metis.xml
regtests/Makefile
Expand Down
12 changes: 12 additions & 0 deletions metisp/workflows/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
AUTOMAKE_OPTIONS = foreign

#Put here all the workflows and associate python files here
WORKFLOWFILES = metis/__init__.py metis/metis_lm_img_wkf.py

#Put here all the recipe parameters associated with the workflow
PARAMETERFILES = metis/metis_parameters.yaml

#This installs the workflow and the OCA rules in reflexaux directory
workflow_DATA = $(WORKFLOWFILES) ${PARAMETERFILES}

EXTRA_DIST = $(WORKFLOWFILES) ${PARAMETERFILES}
Empty file.
16 changes: 16 additions & 0 deletions metisp/workflows/metis/metis_parameters.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
default_parameters: &default
is_default: yes
workflow_parameters:
my_workflow_parameter_for_metis: "auto"

qc0_parameters:
<<: *default
is_default: no

science_parameters:
<<: *default
is_default: no
recipe_parameters:
<<: *default_r
my_task_name:
metis.my_recipe_name.my_parameter_name: "auto"
100 changes: 0 additions & 100 deletions metisp/workflows/metis_wkf.py

This file was deleted.