[MGENIE-svn] r90 - in trunk: . configuration/@mgenie_config data_access/genie instruments/utilities/merlin

[apache at svr2.nd.rl.ac.uk]

Author: Toby Perring
Date: Wed Jun 17 14:22:22 2015
New Revision: 90

Added:
   trunk/instruments/utilities/merlin/merlin_flux_gain.m
   trunk/instruments/utilities/merlin/merlin_instrument.m
Modified:
   trunk/configuration/@mgenie_config/mgenie_config.m
   trunk/data_access/genie/instrument_setup.m
   trunk/mgenie_init.m

Log:
Add merlin specific instrument functions.

Edit help for mgenie setup.

refs #4 #16

Modified: trunk/configuration/@mgenie_config/mgenie_config.m
Url: http://svn.isis.rl.ac.uk/viewvc/mgenie/trunk/configuration/%40mgenie_config/mgenie_config.m?r1=89&r2=90

Modified: trunk/data_access/genie/instrument_setup.m
Url: http://svn.isis.rl.ac.uk/viewvc/mgenie/trunk/data_access/genie/instrument_setup.m?r1=89&r2=90

Added: trunk/instruments/utilities/merlin/merlin_flux_gain.m
Url: http://svn.isis.rl.ac.uk/viewvc/mgenie/trunk/instruments/utilities/merlin/merlin_flux_gain.m?view=markup&revision=90

Added: trunk/instruments/utilities/merlin/merlin_instrument.m
Url: http://svn.isis.rl.ac.uk/viewvc/mgenie/trunk/instruments/utilities/merlin/merlin_instrument.m?view=markup&revision=90

Modified: trunk/mgenie_init.m
Url: http://svn.isis.rl.ac.uk/viewvc/mgenie/trunk/mgenie_init.m?r1=89&r2=90