Skip to content

Commit

Permalink
Merge pull request #77 from hamogu/remove_eamirror
Browse files Browse the repository at this point in the history
Remove EA_MIRROR
  • Loading branch information
hamogu authored Nov 28, 2023
2 parents c10fd1d + cc42ed1 commit 4b7e931
Show file tree
Hide file tree
Showing 26 changed files with 8 additions and 1,632 deletions.
8 changes: 0 additions & 8 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,6 @@ marx/data/caldb/hetgD1996-11-01greffpr001N0007.fits
marx/data/caldb/letgD1996-11-01greffpr001N0007.fits
marx/data/caldb/telD1999-07-23aimptsN0002.fits
marx/data/caldb/telD1999-07-23geomN0006.fits
marx/data/ea-mirror/Ae_s1346.dat
marx/data/ea-mirror/mirr-ee.bin
marx/data/ea-mirror/Mirror_EE.bin
marx/data/ea-mirror/README
marx/data/FORMAT.TXT
marx/data/grating/hetgmp1D1996-11-01marxsectorN0002.tbl
marx/data/grating/hetgmp3D1996-11-01marxsectorN0002.tbl
Expand Down Expand Up @@ -268,10 +264,7 @@ marx/libsrc/diffract.c
marx/libsrc/disperse.c
marx/libsrc/dither.c
marx/libsrc/drake.c
marx/libsrc/dump_ee.c
marx/libsrc/eamirror.c
marx/libsrc/ffield.c
marx/libsrc/fix_ee.c
marx/libsrc/grating.c
marx/libsrc/hrc.h
marx/libsrc/hrc-i.c
Expand All @@ -287,7 +280,6 @@ marx/libsrc/marx-feat.h
marx/libsrc/_marx.h
marx/libsrc/marx.h
marx/libsrc/marxio.c
marx/libsrc/mblur.c
marx/libsrc/mirror.c
marx/libsrc/modules.lis
marx/libsrc/parm.c
Expand Down
3 changes: 0 additions & 3 deletions marx/autoconf/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ fi
AC_CONFIG_FILES([$CF_Output_Files data/Makefile doc/Makefile])
AC_OUTPUT

JD_CREATE_EXEC_RULE(fix_ee)
JD_CREATE_EXEC_RULE(dump_ee)

JD_APPEND_RULES(libsrc/Makefile)

dnl We may be configuring just marxlib and the src directory may not be
Expand Down
10 changes: 0 additions & 10 deletions marx/data/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ SRC_FILES = Makefile bdat2tbl.c tbl2bdat.c
OBS_FILES = acis_i_obs.par acis_s_obs.par hrc_i_obs.par hrc_s_obs.par
PIXLIB_FILES = pix_corner_lsi.par pix_sim_table_flight.par
ACIS_FILES = README
EA_MIRROR_FILES = README Ae_s1346.dat Mirror_EE.bin

GRATING_FILES = README optical-constants.dat optical-constants.xray \
hetgmp1D1996-11-01marxsectorN0002.tbl hetgmp3D1996-11-01marxsectorN0002.tbl \
Expand Down Expand Up @@ -49,7 +48,6 @@ install-dirs:
$(MKINSTDIR) $(DEST_DATADIR)/hrma
$(MKINSTDIR) $(DEST_DATADIR)/hrc
$(MKINSTDIR) $(DEST_DATADIR)/grating
$(MKINSTDIR) $(DEST_DATADIR)/ea-mirror
$(MKINSTDIR) $(DEST_DATADIR)/acis
$(MKINSTDIR) $(DEST_DATADIR)/pixlib
$(MKINSTDIR) $(DEST_DATADIR)/obs
Expand Down Expand Up @@ -95,14 +93,6 @@ install: install-dirs
exit 1; \
fi; \
done
@for X in $(EA_MIRROR_FILES); do \
Y=$(DEST_DATADIR)/ea-mirror; \
echo Installing $$X in $$Y; \
$(INSTALL_DATA) ea-mirror/$$X $$Y/; \
if [ "$$?" != "0" ]; then \
exit 1; \
fi; \
done
@for X in $(GRATING_FILES); do \
Y=$(DEST_DATADIR)/grating; \
echo Installing $$X in $$Y; \
Expand Down
9 changes: 2 additions & 7 deletions marx/data/README
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,11 @@ files:
./caldb
This directory contains files that are copied over from CALDB
(so that MARX users don't need a full CALDB isntallation to run
MARX) or that are derived fomr CALDB files, e.g. by re-ordering
as CALDB file. ]
MARX) or that are derived from CALDB files, e.g. by re-ordering
as CALDB file.
This directory also contains a S-Lang script to generate some of
these files from CALDB.

./ea-mirror
This directory contains data files need by the MARX EA-MIRROR
module. This module is deprecated and the files will not be
updated any longer.

./grating
This directory contains data files for the HETG and LETG.

Expand Down
Binary file removed marx/data/ea-mirror/Ae_s1346.dat
Binary file not shown.
Binary file removed marx/data/ea-mirror/Mirror_EE.bin
Binary file not shown.
17 changes: 0 additions & 17 deletions marx/data/ea-mirror/README

This file was deleted.

Binary file removed marx/data/ea-mirror/mirr-ee.bin
Binary file not shown.
11 changes: 0 additions & 11 deletions marx/data/utils/README
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
This directory contains programs and scripts that are used to make several
of the MARX data input files. Individual scripts are commented.

Here some general remarks
-------------------------
mk_hrma_ea.sl, mkcorr.sl, run_mkarf.sh:
These scripts make input for the ea-mirror model.
See Makefile for invocation.
Since the ea-mirror model should not be used any longer and
is of historical interest only, these scripts are not used any more.
The ea-mirror model stays frozen and **does not** receive regular
updates; thus, it **does not** follow recent improvments in CALDB.
Users should use the more accurate HRMA mirror model.
70 changes: 0 additions & 70 deletions marx/data/utils/mk_hrma_ea.sl

This file was deleted.

Loading

0 comments on commit 4b7e931

Please sign in to comment.