salt 2.4

Closes #26199.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

1 files changed, 19 insertions, 124 deletions

diff --git a/Library/Formula/salt.rb b/Library/Formula/salt.rb
index 9382bed96..72ffbb3d1 100644
--- a/Library/Formula/salt.rb
+++ b/Library/Formula/salt.rb
@@ -1,155 +1,50 @@
 require 'formula'
 
 class Salt < Formula
-  homepage 'http://supernovae.in2p3.fr/~guy/salt/'
-  url 'http://supernovae.in2p3.fr/~guy/salt/download/snfit-2.2.2b.tar.gz'
-  sha1 'e435ca19d22800f95f5363038297593ec4dae97f'
+  homepage 'http://supernovae.in2p3.fr/salt/doku.php?id=start'
+  url 'http://supernovae.in2p3.fr/salt/lib/exe/fetch.php?media=snfit-2.4.0.tar.gz'
+  sha1 '7f6e36e78199d8dec0458b464643e1e90fc51282'
+  version '2.4'
 
   depends_on :fortran
 
   conflicts_with 'fastbit', :because => 'both install `include/filter.h`'
 
-  resource 'SALT2' do
-    url 'http://supernovae.in2p3.fr/~guy/salt-dev/download/salt2_model_data-2-0.tar.gz'
-    sha1 '271e67d764c98b423dfaa264b9baf759a46acff1'
+  resource 'data' do
+    url 'http://supernovae.in2p3.fr/salt/lib/exe/fetch.php?media=salt2-4_data.tgz'
+    sha1 '92c34fe3363fe6a88c8cda75c543503a9b3196f7'
   end
 
-  resource '04D3gx' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-04D3gx.tar.gz"
-    sha1 '6267be3319f4c777d8f67642bb0e9bfde298ffff'
-    version '2.2.2b'
-  end
-
-  resource '4SHOOTER2' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-4Shooter2.tar.gz"
-    sha1 '6929813baaf5368979325d79ca1ea8068f410a1d'
-    version '2.2.2b'
-  end
-
-  resource 'SWOPE' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-CSP-Swope.tar.gz"
-    sha1 '3ec88a86d77693d8f99c95b76a0a6208208ccfcd'
-    version '2.2.2b'
-  end
-
-  resource 'ACSWF' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-HST-ACSWF.tar.gz"
-    sha1 '1d3c49efe65964c69d932314c0e137fa746b7b71'
-    version '2.2.2b'
-  end
-
-  resource 'NICMOS2' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-HST-NICMOS2.tar.gz"
-    sha1 '52bce4a15bf3a6e2c6fe93c9077cc85865cf58db'
-    version '2.2.2b'
-  end
-
-  resource 'KEPLERCAM' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Keplercam.tar.gz"
-    sha1 'de1e79204c05457c86ea07918cb3a1c2bdde9d21'
-    version '2.2.2b'
-  end
-
-  resource 'STANDARD' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Landolt-model.tar.gz"
-    sha1 'd2421fb470f678ee94619622433fb975339fe7ac'
-    version '2.2.2b'
-  end
-
-  resource 'MEGACAM' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Megacam-model.tar.gz"
-    sha1 '8b112a69881bb6a9967576b5e18c8d62b93f009b'
-    version '2.2.2b'
-  end
-
-  resource 'SDSS' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-SDSS-model-Doi2010.tar.gz"
-    sha1 '8858167928151bc07e790c30abf609614ad817d2'
-    version '2.2.2b'
-  end
-
-  resource 'SDSS-AB-off' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-SDSS-magsys.tar.gz"
-    sha1 'd1e4a4c5fe7f56c2502ba42f0b3e28f5168928be'
-    version '2.2.2b'
-  end
-
-  resource 'VEGAHST' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Vega-magsys.tar.gz"
-    sha1 'add0b1df6353a34912311c1a1973b03147862539'
-    version '2.2.2b'
-  end
-
-  resource 'VEGA' do
-    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-magsys-1.tar.gz"
-    sha1 '4f3f05d1d08c6840f13b0ec6101826159a450eff'
-    version '2.2.2b'
-  end
-
-
-  def install_resource(name, dir)
-    resource(name).stage do
-      d = File.basename Dir.pwd
-      (dir/d).install Dir['*']
-
-      # the fitmodel file will link by default to the first dir
-      # on the path right after #{prefix}/data/
-      linkto = {
-        'SDSS-AB-off' => 'MagSys/SDSS-AB-off.dat',
-        'VEGAHST'     => 'MagSys/Vega0.dat',
-        'VEGA'        => 'MagSys/BD17-snls3.dat',
-      }.fetch(name) do
-        base = File.basename(dir)
-        base == 'data' ? d : File.join(base, d)
-      end
-
-      "@#{name} #{linkto}\n"
-    end
+  resource '03d4ag' do
+    url 'http://supernovae.in2p3.fr/salt/lib/exe/fetch.php?media=jla-03d4ag.tar.gz'
+    sha1 'b227f5e50ea227375720f3c00dd849f964cfa2ba'
   end
 
   def install
     ENV.deparallelize
     # the libgfortran.a path needs to be set explicitly
-    # for the --enable-gfortran option to work
     libgfortran = `$FC --print-file-name libgfortran.a`.chomp
-    ENV.append 'LDFLAGS', "-L#{File.dirname libgfortran}"
-    system "./configure", "--prefix=#{prefix}", "--enable-gfortran"
+    ENV.append 'LDFLAGS', "-L#{File.dirname libgfortran} -lgfortran"
+    system "./configure", "--prefix=#{prefix}", "--disable-static"
     system "make install"
-
     # install all the model data
-    # http://supernovae.in2p3.fr/~guy/salt/download/snls3-intallation.sh
-    (data = prefix/'data').mkpath
-    (data/'fitmodel.card').open('w') do |f|
-      # salt2 model + magsys
-      %w{SALT2 VEGA SDSS-AB-off VEGAHST}.each do |name|
-        f.write(install_resource(name, data))
-      end
-      # instruments
-      inst = data + 'Instruments'
-      %w{
-        STANDARD MEGACAM KEPLERCAM 4SHOOTER2
-        SDSS SWOPE ACSWF NICMOS2
-      }.each do |name|
-        f.write(install_resource(name, inst))
-      end
-    end
-
+    (prefix/'data').install resource('data')
     # for testing
-    (prefix/'04D3gx').install resource('04D3gx')
+    (prefix/'03d4ag').install resource('03d4ag')
   end
 
   test do
-    ENV['PATHMODEL'] = "#{prefix}/data"
-    cp_r Dir[prefix + '04D3gx' + '*'], '.'
+    ENV['SALTPATH'] = "#{prefix}/data"
+    cp_r Dir[prefix + '03d4ag' + '*'], '.'
     # I don't know why I need to redo the cd on the shell, but it doesn't work otherwise
-    system "cd #{Dir.pwd}; #{bin}/snfit lc2fit_g.dat lc2fit_r.dat lc2fit_i.dat lc2fit_z.dat"
-    system "cat result_salt2.dat result_salt2_SNLS3.dat"
+    system "cd #{Dir.pwd}; #{bin}/snfit lc-03D4ag.list"
+    system "cat result_salt2.dat"
   end
 
   def caveats
     <<-EOS.undent
     You should add the following to your .bashrc or equivalent:
-      export PATHMODEL=#{prefix}/data
+      export SALTPATH=#{prefix}/data
     EOS
   end