-
Notifications
You must be signed in to change notification settings - Fork 4
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
base: alan
Are you sure you want to change the base?
Commits on Nov 23, 2015
-
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.
Configuration menu - View commit details
-
Copy full SHA for 8e70e55 - Browse repository at this point
Copy the full SHA 8e70e55View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c27ff9 - Browse repository at this point
Copy the full SHA 8c27ff9View commit details
Commits on Dec 19, 2015
-
Configuration menu - View commit details
-
Copy full SHA for 30bc367 - Browse repository at this point
Copy the full SHA 30bc367View commit details -
Configuration menu - View commit details
-
Copy full SHA for 812cfec - Browse repository at this point
Copy the full SHA 812cfecView commit details -
Configuration menu - View commit details
-
Copy full SHA for 86e59fa - Browse repository at this point
Copy the full SHA 86e59faView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4a97c38 - Browse repository at this point
Copy the full SHA 4a97c38View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for ad2eca6 - Browse repository at this point
Copy the full SHA ad2eca6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9664acb - Browse repository at this point
Copy the full SHA 9664acbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 80d972b - Browse repository at this point
Copy the full SHA 80d972bView commit details -
Configuration menu - View commit details
-
Copy full SHA for e895fc0 - Browse repository at this point
Copy the full SHA e895fc0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 031e059 - Browse repository at this point
Copy the full SHA 031e059View commit details -
Configuration menu - View commit details
-
Copy full SHA for 580866a - Browse repository at this point
Copy the full SHA 580866aView commit details -
Configuration menu - View commit details
-
Copy full SHA for c01d779 - Browse repository at this point
Copy the full SHA c01d779View commit details -
Configuration menu - View commit details
-
Copy full SHA for 61f2cf0 - Browse repository at this point
Copy the full SHA 61f2cf0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2830e92 - Browse repository at this point
Copy the full SHA 2830e92View commit details -
Configuration menu - View commit details
-
Copy full SHA for 53c0994 - Browse repository at this point
Copy the full SHA 53c0994View commit details -
Configuration menu - View commit details
-
Copy full SHA for b7ba184 - Browse repository at this point
Copy the full SHA b7ba184View commit details -
Configuration menu - View commit details
-
Copy full SHA for f9fdd45 - Browse repository at this point
Copy the full SHA f9fdd45View commit details -
Configuration menu - View commit details
-
Copy full SHA for 39e5908 - Browse repository at this point
Copy the full SHA 39e5908View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2bee797 - Browse repository at this point
Copy the full SHA 2bee797View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 64f7baf - Browse repository at this point
Copy the full SHA 64f7bafView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8a2d36c - Browse repository at this point
Copy the full SHA 8a2d36cView commit details -
Configuration menu - View commit details
-
Copy full SHA for b1536de - Browse repository at this point
Copy the full SHA b1536deView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for a4e5094 - Browse repository at this point
Copy the full SHA a4e5094View commit details -
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).
Configuration menu - View commit details
-
Copy full SHA for 5d61170 - Browse repository at this point
Copy the full SHA 5d61170View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8f2513e - Browse repository at this point
Copy the full SHA 8f2513eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 55fb93a - Browse repository at this point
Copy the full SHA 55fb93aView commit details -
Configuration menu - View commit details
-
Copy full SHA for d346efd - Browse repository at this point
Copy the full SHA d346efdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 697132e - Browse repository at this point
Copy the full SHA 697132eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 29831bd - Browse repository at this point
Copy the full SHA 29831bdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 39d34a6 - Browse repository at this point
Copy the full SHA 39d34a6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 05a981c - Browse repository at this point
Copy the full SHA 05a981cView commit details
Commits on Feb 10, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 0fe2abc - Browse repository at this point
Copy the full SHA 0fe2abcView commit details
Commits on Feb 16, 2016
-
Configuration menu - View commit details
-
Copy full SHA for f39dc70 - Browse repository at this point
Copy the full SHA f39dc70View commit details
Commits on Feb 23, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 1dedfb1 - Browse repository at this point
Copy the full SHA 1dedfb1View commit details
Commits on Feb 24, 2016
-
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.
Configuration menu - View commit details
-
Copy full SHA for ec354cf - Browse repository at this point
Copy the full SHA ec354cfView commit details
Commits on Mar 18, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 849736c - Browse repository at this point
Copy the full SHA 849736cView commit details -
Configuration menu - View commit details
-
Copy full SHA for aab8329 - Browse repository at this point
Copy the full SHA aab8329View commit details
Commits on Mar 24, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 9e3c1cf - Browse repository at this point
Copy the full SHA 9e3c1cfView commit details
Commits on Apr 1, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 955a6f1 - Browse repository at this point
Copy the full SHA 955a6f1View commit details
Commits on Apr 7, 2016
-
Configuration menu - View commit details
-
Copy full SHA for ef83d5b - Browse repository at this point
Copy the full SHA ef83d5bView commit details -
Configuration menu - View commit details
-
Copy full SHA for c0b5a5e - Browse repository at this point
Copy the full SHA c0b5a5eView commit details -
Configuration menu - View commit details
-
Copy full SHA for e730525 - Browse repository at this point
Copy the full SHA e730525View commit details -
Merge pull request Chandra-MARX#21 from hamogu/fix_hole
MARX PSF wrong for off-axis sources
Configuration menu - View commit details
-
Copy full SHA for 380e9dd - Browse repository at this point
Copy the full SHA 380e9ddView commit details -
Merge pull request Chandra-MARX#22 from hamogu/simput
SIMPUT format source
Configuration menu - View commit details
-
Copy full SHA for 602ee35 - Browse repository at this point
Copy the full SHA 602ee35View commit details -
Configuration menu - View commit details
-
Copy full SHA for 465e6fb - Browse repository at this point
Copy the full SHA 465e6fbView commit details -
Configuration menu - View commit details
-
Copy full SHA for dcb5541 - Browse repository at this point
Copy the full SHA dcb5541View commit details
Commits on Apr 27, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 6f209f3 - Browse repository at this point
Copy the full SHA 6f209f3View commit details
Commits on May 9, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 6ed5896 - Browse repository at this point
Copy the full SHA 6ed5896View commit details
Commits on May 10, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 7e4ab05 - Browse repository at this point
Copy the full SHA 7e4ab05View commit details
Commits on Aug 5, 2016
-
Configuration menu - View commit details
-
Copy full SHA for c70c24a - Browse repository at this point
Copy the full SHA c70c24aView commit details -
Merge pull request Chandra-MARX#29 from jzuhone/fix_simput
Ensuring the constant ARF for SIMPUT stays constant.
Configuration menu - View commit details
-
Copy full SHA for 4066825 - Browse repository at this point
Copy the full SHA 4066825View commit details -
Configuration menu - View commit details
-
Copy full SHA for 938dfea - Browse repository at this point
Copy the full SHA 938dfeaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1d2b50f - Browse repository at this point
Copy the full SHA 1d2b50fView commit details
Commits on Dec 1, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 1346e8d - Browse repository at this point
Copy the full SHA 1346e8dView commit details
Commits on Dec 2, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 13bec42 - Browse repository at this point
Copy the full SHA 13bec42View commit details
Commits on Aug 30, 2017
-
Configuration menu - View commit details
-
Copy full SHA for c7ea58a - Browse repository at this point
Copy the full SHA c7ea58aView commit details
Commits on Dec 13, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 8868e0a - Browse repository at this point
Copy the full SHA 8868e0aView commit details
Commits on Dec 3, 2018
-
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-*.
Configuration menu - View commit details
-
Copy full SHA for 351f742 - Browse repository at this point
Copy the full SHA 351f742View commit details -
Merge pull request Chandra-MARX#35 from hamogu/hrcpars
Change defaults in marx.par for HRC PSF
Configuration menu - View commit details
-
Copy full SHA for b120e8f - Browse repository at this point
Copy the full SHA b120e8fView commit details
Commits on Dec 7, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 837b64f - Browse repository at this point
Copy the full SHA 837b64fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4ee4de1 - Browse repository at this point
Copy the full SHA 4ee4de1View commit details
Commits on Jul 8, 2019
-
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.
Configuration menu - View commit details
-
Copy full SHA for dde635d - Browse repository at this point
Copy the full SHA dde635dView commit details -
Merge pull request Chandra-MARX#36 from hamogu/i2i4
Change data type of PI and PHA columns written to match CIAO
Configuration menu - View commit details
-
Copy full SHA for 2ee6393 - Browse repository at this point
Copy the full SHA 2ee6393View commit details
Commits on Jul 12, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 3090dcc - Browse repository at this point
Copy the full SHA 3090dccView commit details -
Configuration menu - View commit details
-
Copy full SHA for 08191da - Browse repository at this point
Copy the full SHA 08191daView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7daf2a8 - Browse repository at this point
Copy the full SHA 7daf2a8View commit details -
Configuration menu - View commit details
-
Copy full SHA for dfd3eb0 - Browse repository at this point
Copy the full SHA dfd3eb0View commit details
Commits on Jul 19, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 7f03391 - Browse repository at this point
Copy the full SHA 7f03391View commit details
Commits on Jul 26, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 74cc8b5 - Browse repository at this point
Copy the full SHA 74cc8b5View commit details
Commits on Dec 9, 2019
-
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
Configuration menu - View commit details
-
Copy full SHA for 7ef0da4 - Browse repository at this point
Copy the full SHA 7ef0da4View commit details -
Merge pull request Chandra-MARX#39 from hamogu/fix_38
Assign energy before calling user_create_ray
Configuration menu - View commit details
-
Copy full SHA for 5cb2ae6 - Browse repository at this point
Copy the full SHA 5cb2ae6View commit details -
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!
Configuration menu - View commit details
-
Copy full SHA for 01c6866 - Browse repository at this point
Copy the full SHA 01c6866View commit details -
Merge pull request Chandra-MARX#40 from hamogu/andrea_model
Add contributed user model
Configuration menu - View commit details
-
Copy full SHA for bd3bb58 - Browse repository at this point
Copy the full SHA bd3bb58View commit details
Commits on Jan 26, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 2013aa5 - Browse repository at this point
Copy the full SHA 2013aa5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 108c1d1 - Browse repository at this point
Copy the full SHA 108c1d1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 499ba26 - Browse repository at this point
Copy the full SHA 499ba26View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for e8a6b9f - Browse repository at this point
Copy the full SHA e8a6b9fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6a3a722 - Browse repository at this point
Copy the full SHA 6a3a722View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7e88e31 - Browse repository at this point
Copy the full SHA 7e88e31View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9bc950c - Browse repository at this point
Copy the full SHA 9bc950cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4ded1b8 - Browse repository at this point
Copy the full SHA 4ded1b8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7160c81 - Browse repository at this point
Copy the full SHA 7160c81View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9cfcc88 - Browse repository at this point
Copy the full SHA 9cfcc88View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8ffdacf - Browse repository at this point
Copy the full SHA 8ffdacfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 33c3143 - Browse repository at this point
Copy the full SHA 33c3143View commit details -
Configuration menu - View commit details
-
Copy full SHA for ae92139 - Browse repository at this point
Copy the full SHA ae92139View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7be0be3 - Browse repository at this point
Copy the full SHA 7be0be3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 316372a - Browse repository at this point
Copy the full SHA 316372aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 56d3626 - Browse repository at this point
Copy the full SHA 56d3626View commit details -
Configuration menu - View commit details
-
Copy full SHA for 68111fa - Browse repository at this point
Copy the full SHA 68111faView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 069b723 - Browse repository at this point
Copy the full SHA 069b723View commit details -
Configuration menu - View commit details
-
Copy full SHA for dbfaa05 - Browse repository at this point
Copy the full SHA dbfaa05View commit details -
Configuration menu - View commit details
-
Copy full SHA for f05d11a - Browse repository at this point
Copy the full SHA f05d11aView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 7bb5501 - Browse repository at this point
Copy the full SHA 7bb5501View commit details -
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).
Configuration menu - View commit details
-
Copy full SHA for f813573 - Browse repository at this point
Copy the full SHA f813573View commit details -
Configuration menu - View commit details
-
Copy full SHA for a486174 - Browse repository at this point
Copy the full SHA a486174View commit details -
Configuration menu - View commit details
-
Copy full SHA for 17ac509 - Browse repository at this point
Copy the full SHA 17ac509View commit details -
Configuration menu - View commit details
-
Copy full SHA for c312ea6 - Browse repository at this point
Copy the full SHA c312ea6View commit details -
Configuration menu - View commit details
-
Copy full SHA for fc6e558 - Browse repository at this point
Copy the full SHA fc6e558View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ff2ef7 - Browse repository at this point
Copy the full SHA 0ff2ef7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ea694d - Browse repository at this point
Copy the full SHA 0ea694dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 83b1fb9 - Browse repository at this point
Copy the full SHA 83b1fb9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 13e549d - Browse repository at this point
Copy the full SHA 13e549dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3b1554e - Browse repository at this point
Copy the full SHA 3b1554eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1464d70 - Browse repository at this point
Copy the full SHA 1464d70View commit details -
Configuration menu - View commit details
-
Copy full SHA for bf78966 - Browse repository at this point
Copy the full SHA bf78966View commit details
Commits on Feb 8, 2020
-
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.
Configuration menu - View commit details
-
Copy full SHA for 6b62254 - Browse repository at this point
Copy the full SHA 6b62254View commit details -
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).
Configuration menu - View commit details
-
Copy full SHA for 7dfa7f6 - Browse repository at this point
Copy the full SHA 7dfa7f6View commit details
Commits on Feb 9, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 72d15ae - Browse repository at this point
Copy the full SHA 72d15aeView commit details
Commits on Aug 31, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 8e84692 - Browse repository at this point
Copy the full SHA 8e84692View commit details