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

Change MARX to automake #16

Open
wants to merge 111 commits into
base: alan
Choose a base branch
from
Open

Change MARX to automake #16

wants to merge 111 commits into from

Commits on Nov 23, 2015

  1. add .gitignore for every subproject

    The .gitignores contain the autotools files at the location wehre I finally want
    them when I'm doen with the autmomake conversion.
    hamogu committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    8e70e55 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8c27ff9 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2015

  1. Configuration menu
    Copy the full SHA
    30bc367 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    812cfec View commit details
    Browse the repository at this point in the history
  3. remove VAX specific test

    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    86e59fa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4a97c38 View commit details
    Browse the repository at this point in the history
  5. remove jdsys.h

    Move test for enidanness into autoconf.
    Previously, a Makefile would compile and run a special program that
    tested system characteristics nad wrote an output file, which in
    turn would be inlcuded as a header file.
    This task is better left to autoconf.
    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    ad2eca6 View commit details
    Browse the repository at this point in the history
  6. AC_INIT to modern form

    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    9664acb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    80d972b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e895fc0 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    031e059 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    580866a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    c01d779 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    61f2cf0 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    2830e92 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    53c0994 View commit details
    Browse the repository at this point in the history
  15. run autoreconf

    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    b7ba184 View commit details
    Browse the repository at this point in the history
  16. remove obsolete file

    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    f9fdd45 View commit details
    Browse the repository at this point in the history
  17. remove empty file

    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    39e5908 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    2bee797 View commit details
    Browse the repository at this point in the history
  19. flatten marx directory and convert to automake

    This proved more difficult than expected; in particular to pick
    the right inputs for libmarx.a (which is far more than the *lis file states).
    Because everything depends on everything (the directory structure on configure.ac,
    the configure.ac on automake, automake on my ability ot formulate the right rules, ...)
    this is not a small atomic commit but rather a "dumb everything in one buckt".
    
    At this point automake + autoconf + autoheader work and compile
    (I did not test if marx runs, yet!).
    There is no use of libtool yet.
    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    64f7baf View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    8a2d36c View commit details
    Browse the repository at this point in the history
  21. add pfiles to install list

    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    b1536de View commit details
    Browse the repository at this point in the history
  22. Add fitsdump, bestfocus and other helpers to automake.

    Also, change their installation location from /lib/marx to /bin.
    This puts all binary executables in one place.
    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    a4e5094 View commit details
    Browse the repository at this point in the history
  23. Do not regenerate mirr_ee.bin during install

    This file has not changed for 10 years and it's not big. It is much
    simpler to include the binary in the distribution tarball.
    (It's been in the repro for a long time anyway).
    hamogu committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    5d61170 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    8f2513e View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    55fb93a View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    d346efd View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    697132e View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    29831bd View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    39d34a6 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    05a981c View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2016

  1. fix hole in off-axis PSF

    hamogu committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    0fe2abc View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2016

  1. Configuration menu
    Copy the full SHA
    f39dc70 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2016

  1. SIMPUT source draft

    hamogu committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    1dedfb1 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2016

  1. Make s-simput.c compile

    This neds seceral new dependencies, which I've just put in the Makefiles by hand for experimenting now:
      -L/melkor/d1/guenther/soft/simput/lib/ -lsimput -lhdio in marx/srclib and marx/scr
    and CFLAGS and LD_LIBRARY_FLAGS to point to the include and ./.so files.
    hamogu committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    ec354cf View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2016

  1. Configuration menu
    Copy the full SHA
    849736c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aab8329 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2016

  1. Configuration menu
    Copy the full SHA
    9e3c1cf View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2016

  1. Configuration menu
    Copy the full SHA
    955a6f1 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2016

  1. Configuration menu
    Copy the full SHA
    ef83d5b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c0b5a5e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e730525 View commit details
    Browse the repository at this point in the history
  4. Merge pull request Chandra-MARX#21 from hamogu/fix_hole

    MARX PSF wrong for off-axis sources
    hamogu committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    380e9dd View commit details
    Browse the repository at this point in the history
  5. Merge pull request Chandra-MARX#22 from hamogu/simput

    SIMPUT format source
    hamogu committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    602ee35 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    465e6fb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    dcb5541 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2016

  1. Configuration menu
    Copy the full SHA
    6f209f3 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2016

  1. Configuration menu
    Copy the full SHA
    6ed5896 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2016

  1. Configuration menu
    Copy the full SHA
    7e4ab05 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2016

  1. Configuration menu
    Copy the full SHA
    c70c24a View commit details
    Browse the repository at this point in the history
  2. Merge pull request Chandra-MARX#29 from jzuhone/fix_simput

    Ensuring the constant ARF for SIMPUT stays constant.
    hamogu authored Aug 5, 2016
    Configuration menu
    Copy the full SHA
    4066825 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    938dfea View commit details
    Browse the repository at this point in the history
  4. version number to 5.3.1

    hamogu committed Aug 5, 2016
    Configuration menu
    Copy the full SHA
    1d2b50f View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2016

  1. Configuration menu
    Copy the full SHA
    1346e8d View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2016

  1. Configuration menu
    Copy the full SHA
    13bec42 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2017

  1. Add return statements to to several functions.

    Alan M. Levine authored and hamogu committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    c7ea58a View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2017

  1. Configuration menu
    Copy the full SHA
    8868e0a View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2018

  1. Change defaults in marx.par for HRC PSF

    An email from Vinay Kashyap summarizes the reason for this change:
    We discovered a problem with how HRC raytraces of point sources are
    handled.  See attached figure (figure removed because data is not public)
     of radial surface brightness
    profiles of data from a suspected point source vs different methods of
    raytraces.  Green is bare HRMA, sans detector; blue is data; black is
    current default ChaRT+MARX; and red is ChaRT+MARX with different HRC-I
    blur parameters (see below).  The curves are normalized to a peak of
    1.
    
    As you can see, the default raytrace predicts a significantly larger
    wing than is observed.  We believe we have tracked this down to a
    difference in how MARX renormalizes the amplitude of the 2D Lorentzian
    compared to the Sherpa model function.
    
    MARX uses a 2 Gaussian + 1 Lorentzian function to model the HRC
    detector blur.  Diab tested cases where he manually set the amplitudes
    of the second Gaussian and the Lorentzian to zero, and gets a
    reasonably good match to the data --
    HRC-I-BlurG1FWHM=12.44
    HRC-I-BlurG2Amp=0
    HRC-I-BlurL1Amp=0
    The same changes would also apply to HRC-S-*.
    hamogu committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    351f742 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Chandra-MARX#35 from hamogu/hrcpars

    Change defaults in marx.par for HRC PSF
    hamogu authored Dec 3, 2018
    Configuration menu
    Copy the full SHA
    b120e8f View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2018

  1. Update CalDB to 4.8.2

    hamogu committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    837b64f View commit details
    Browse the repository at this point in the history
  2. Version to 5.4

    hamogu committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    4ee4de1 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2019

  1. Change data type of PI and PHA columns written to match CIAO

    This is required to dmmerge marx2fits output to e.g. ACIS stowed background files.
    The exampel I used ot test this earlier used he background file
    acis7sD2009-09-21bkgrndN0001.fits
    where the N0001 in the file name is a version number. That older version uses the
     >i2 type and I had made marx to match that. In the current CALDB, there is a newer version of this file
    acis7sD2009-09-21bkgrndN0002.fits
    which is version N0002, which uses >i4 data datatype for PHA and PI columns.
    My scripts did not catch that change, because I had the filename of the datafile hardcoded.
    This commit switches marx2fits to use >i4 to match the event files (and background files)
    that the current version of CIAO produces.
    hamogu committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    dde635d View commit details
    Browse the repository at this point in the history
  2. Merge pull request Chandra-MARX#36 from hamogu/i2i4

    Change data type of PI and PHA columns written to match CIAO
    hamogu authored Jul 8, 2019
    Configuration menu
    Copy the full SHA
    2ee6393 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2019

  1. Changes by Alan

    hamogu committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    3090dcc View commit details
    Browse the repository at this point in the history
  2. add comment

    hamogu committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    08191da View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7daf2a8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dfd3eb0 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2019

  1. Configuration menu
    Copy the full SHA
    7f03391 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2019

  1. Configuration menu
    Copy the full SHA
    74cc8b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2019

  1. Assign energy before calling user_create_ray

    User-compiled sources (``SourceType="USER"``) have a function called
    ``user_create_ray`` which is called with a pointer to ray properties
    (direction, time, and energy). All ray properties used to be undefined before
    calling this function and the user function could return ``-1`` for energy and
    time to have |marx| assign energy and time. Now, ``energy`` is initialized
    *before* ``user_create_ray`` is called, to allow user code that assigns
    locations based on the ray energy.  With this change, marx.par must contain a
    valid specification for the source spectrum, since an energy will be drawn,
    even if the user source later assigns a different value. For
    backwards-compatibility, if ``user_create_ray`` sets the energy to a negative
    value, |marx| will assign the energy drawn before to the variable again.
    
    closes Chandra-MARX#38
    hamogu committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    7ef0da4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Chandra-MARX#39 from hamogu/fix_38

    Assign energy before calling user_create_ray
    hamogu authored Dec 9, 2019
    Configuration menu
    Copy the full SHA
    5cb2ae6 View commit details
    Browse the repository at this point in the history
  3. Add contributed user model

    This model was developed by @andrea-belfiore for one specific application.
    It's included in MARX not necessarily because we expect other users to need
    exactly this model, but like the other examples, because it is a good case
    to see how different, realistic types of user model can be implemented.
    
    Thanks to @andrea-belfiore for sharing!
    hamogu committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    01c6866 View commit details
    Browse the repository at this point in the history
  4. Merge pull request Chandra-MARX#40 from hamogu/andrea_model

    Add contributed user model
    hamogu authored Dec 9, 2019
    Configuration menu
    Copy the full SHA
    bd3bb58 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2020

  1. Configuration menu
    Copy the full SHA
    2013aa5 View commit details
    Browse the repository at this point in the history
  2. remove VAX specific test

    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    108c1d1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    499ba26 View commit details
    Browse the repository at this point in the history
  4. remove jdsys.h

    Move test for enidanness into autoconf.
    Previously, a Makefile would compile and run a special program that
    tested system characteristics nad wrote an output file, which in
    turn would be inlcuded as a header file.
    This task is better left to autoconf.
    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    e8a6b9f View commit details
    Browse the repository at this point in the history
  5. AC_INIT to modern form

    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    6a3a722 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7e88e31 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9bc950c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4ded1b8 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7160c81 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    9cfcc88 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    8ffdacf View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    33c3143 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    ae92139 View commit details
    Browse the repository at this point in the history
  14. run autoreconf

    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    7be0be3 View commit details
    Browse the repository at this point in the history
  15. remove obsolete file

    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    316372a View commit details
    Browse the repository at this point in the history
  16. remove empty file

    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    56d3626 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    68111fa View commit details
    Browse the repository at this point in the history
  18. flatten marx directory and convert to automake

    This proved more difficult than expected; in particular to pick
    the right inputs for libmarx.a (which is far more than the *lis file states).
    Because everything depends on everything (the directory structure on configure.ac,
    the configure.ac on automake, automake on my ability ot formulate the right rules, ...)
    this is not a small atomic commit but rather a "dumb everything in one buckt".
    
    At this point automake + autoconf + autoheader work and compile
    (I did not test if marx runs, yet!).
    There is no use of libtool yet.
    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    069b723 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    dbfaa05 View commit details
    Browse the repository at this point in the history
  20. add pfiles to install list

    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    f05d11a View commit details
    Browse the repository at this point in the history
  21. Add fitsdump, bestfocus and other helpers to automake.

    Also, change their installation location from /lib/marx to /bin.
    This puts all binary executables in one place.
    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    7bb5501 View commit details
    Browse the repository at this point in the history
  22. Do not regenerate mirr_ee.bin during install

    This file has not changed for 10 years and it's not big. It is much
    simpler to include the binary in the distribution tarball.
    (It's been in the repro for a long time anyway).
    hamogu committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    f813573 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    a486174 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    17ac509 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    c312ea6 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    fc6e558 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    0ff2ef7 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    0ea694d View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    83b1fb9 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    13e549d View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    3b1554e View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    1464d70 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    bf78966 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2020

  1. Change rsp sub-dir to be build as its own package

    pfiles, jdfits, and jdmath all have their own configure and makefiles.
    This commit introduces the same for rsp. In particular since rsp
    needs cfitsio, while the main program does not, it seems reasonble to
    build it separately.
    hamogu committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    6b62254 View commit details
    Browse the repository at this point in the history
  2. Make make work

    At this stage, all automake and autoconf files do work and compile
    all tools sucessfully.
    The conversion to automake is not complete (e.g. rsp should only be compiled if cfitsio
    is available and the autput of running marx should print useful messages where data and
    par files can be found).
    hamogu committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    7dfa7f6 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2020

  1. Configuration menu
    Copy the full SHA
    72d15ae View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2020

  1. Configuration menu
    Copy the full SHA
    8e84692 View commit details
    Browse the repository at this point in the history