Added SMEI passband to legacy.

phoebe-project · Aug 9, 2019 · 1ac20b2 · 1ac20b2
1 parent c4259c3
commit 1ac20b2
Show file tree

Hide file tree

Showing 10 changed files with 855 additions and 9 deletions.
diff --git a/cats/ld/smei.ld b/cats/ld/smei.ld
@@ -2,7 +2,7 @@
 # PASSBAND  filterless
 # VERSION   1.0
 
-# Exported from PHOEBE-2 passband on Fri Aug  9 08:08:29 2019
+# Exported from PHOEBE-2 passband on Fri Aug  9 08:07:32 2019
 # The coefficients are computed for the photon-weighted regime from ck2004 atmospheres.
 
  0.762  0.813  0.263  0.295  0.567  0.509  0.280  1.763 -3.764  4.798 -1.854 

diff --git a/phoebe-lib/libphoebe/phoebe_base.c b/phoebe-lib/libphoebe/phoebe_base.c
@@ -180,8 +180,8 @@ int phoebe_load_atm_tables(char *plfile, char *atmfile)
     }
 
     #warning HARDCODED_NUMBER_OF_PASSBANDS
-    PHOEBE_plcof_table  = phoebe_malloc(67*50*sizeof(*PHOEBE_plcof_table));
-    PHOEBE_atmcof_table = phoebe_malloc(67*19*11*48*sizeof(*PHOEBE_atmcof_table));
+    PHOEBE_plcof_table  = phoebe_malloc(68*50*sizeof(*PHOEBE_plcof_table));
+    PHOEBE_atmcof_table = phoebe_malloc(68*19*11*48*sizeof(*PHOEBE_atmcof_table));
 
     row = 0;
     tab = fopen(plfile, "r");

diff --git a/phoebe-lib/libphoebe/phoebe_data.c b/phoebe-lib/libphoebe/phoebe_data.c
@@ -437,6 +437,7 @@ int wd_passband_id_lookup (int *id, const char *passband)
 	if (strcmp (passband,   "STEREO:HI1A-noQE") == 0) { *id = 65; return SUCCESS; }
 	if (strcmp (passband,     "STEREO:HI1B-QE") == 0) { *id = 66; return SUCCESS; }
 	if (strcmp (passband,   "STEREO:HI1B-noQE") == 0) { *id = 67; return SUCCESS; }
+	if (strcmp (passband,    "SMEI:filterless") == 0) { *id = 68; return SUCCESS; }
 
 	*id = -1;
 	return ERROR_PASSBAND_INVALID;

diff --git a/phoebe-lib/libwd/atmx.f b/phoebe-lib/libwd/atmx.f
@@ -21,7 +21,7 @@ subroutine atmx(t,g,ifil,xintlog,xint)
 c       iatmsize  ..   size of the atmosphere grid
 c                        default: iatmsize = 13200*19 = 250800
 c
-      parameter (iplmax  =67)
+      parameter (iplmax  =68)
       parameter (itemppts=48)
       parameter (iloggpts=11)
       parameter (imetpts =19)
@@ -46,7 +46,7 @@ subroutine atmx(t,g,ifil,xintlog,xint)
      $367.d0,485.d0,624.d0,752.d0,867.d0,963.d0,963.d0,326.d0,
      $362.d0,382.d0,431.d0,540.d0,547.d0,550.d0,550.d0,427.d0,
      $623.d0,797.d0,3600.d0,4500.d0,5800.d0,8000.d0,690.d0,
-     $690.d0,690.d0,690.d0/
+     $690.d0,690.d0,690.d0,700.d0/
       tlog=dlog10(t)
       trec=1.d0/t
       tlow=3500.d0-tlowtol

diff --git a/phoebe-lib/libwd/dc.sub.f b/phoebe-lib/libwd/dc.sub.f
@@ -63,7 +63,7 @@ subroutine dc(atmtab,pltab,L3perc,knobs,indeps,fluxes,weights,
       parameter (iclmax=   100)
       parameter (iptmax= 50000)
       parameter (ncmax=     50)
-      parameter (iplmax=    67)
+      parameter (iplmax=    68)
       parameter (ipmax=     50)
 c
 cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
@@ -342,6 +342,7 @@ subroutine dc(atmtab,pltab,L3perc,knobs,indeps,fluxes,weights,
 c      65   STEREO HI-1A, filter without quantum efficiency
 c      66   STEREO HI-1B, filter with quantum efficiency
 c      67   STEREO HI-1B, filter without quantum efficiency
+c      68   Solar Mass Ejection Imager (SMEI), Petr Harmanec, priv. comm.
 c
    15 FORMAT(1X,16(F11.5))
    16 FORMAT(1X,18(F7.4))

diff --git a/phoebe-lib/libwd/lc.sub.f b/phoebe-lib/libwd/lc.sub.f
@@ -50,7 +50,7 @@ subroutine lc(plf,pltab,atmf,atmtab,lcin,request,vertno,L3perc,
       parameter (lpomax=100000)
       parameter (ispmax=   100)
       parameter (iclmax=   100)
-      parameter (iplmax=    67)
+      parameter (iplmax=    68)
 c
 cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 c
@@ -326,6 +326,7 @@ subroutine lc(plf,pltab,atmf,atmtab,lcin,request,vertno,L3perc,
 c      65   STEREO HI-1A, filter without quantum efficiency, Danielle Bewsher, priv. comm.
 c      66   STEREO HI-1B, filter with quantum efficiency, Danielle Bewsher, priv. comm.
 c      67   STEREO HI-1B, filter without quantum efficiency, Danielle Bewsher, priv. comm.
+c      68   Solar Mass Ejection Imager (SMEI), Petr Harmanec, priv. comm.
 c
       do 15067 i=1,ifrmax
       theta(i)=0.d0

diff --git a/phoebe-lib/ptf/Makefile.am b/phoebe-lib/ptf/Makefile.am
@@ -133,6 +133,7 @@ phoebeptf_DATA = 2mass_j.ptf                 \
                  stereo_hi1a.ptf             \
                  stereo_hi1a_qe.ptf          \
                  stereo_hi1b.ptf             \
-                 stereo_hi1b_qe.ptf          
+                 stereo_hi1b_qe.ptf          \
+                 smei.ptf
 
 EXTRA_DIST = $(phoebeptf_DATA)
diff --git a/phoebe-lib/ptf/Makefile.in b/phoebe-lib/ptf/Makefile.in
@@ -433,7 +433,8 @@ phoebeptf_DATA = 2mass_j.ptf                 \
                  stereo_hi1a.ptf             \
                  stereo_hi1a_qe.ptf          \
                  stereo_hi1b.ptf             \
-                 stereo_hi1b_qe.ptf          
+                 stereo_hi1b_qe.ptf          \
+                 smei.ptf
 
 EXTRA_DIST = $(phoebeptf_DATA)
 all: all-am

diff --git a/phoebe-lib/wd/phoebe_atmcof.dat b/phoebe-lib/wd/phoebe_atmcof.dat
diff --git a/phoebe-lib/wd/phoebe_atmcofplanck.dat b/phoebe-lib/wd/phoebe_atmcofplanck.dat
@@ -333,3 +333,8 @@
   -1.355583309D+01   9.054643173D+01  -1.061736402D+02   8.935472528D+01  -5.821171309D+01   2.979206457D+01  -1.179344427D+01   3.446533564D+00  -6.705094999D-01   6.591592728D-02
   -2.028114025D+01   1.118559305D+02  -1.347872816D+02   1.165718610D+02  -7.804654013D+01   4.105788397D+01  -1.671890093D+01   5.034952293D+00  -1.013326243D+00   1.039354643D-01
    7.717850299D+00   4.200073872D+01  -4.973058921D+01   4.250119690D+01  -2.817314686D+01   1.469241476D+01  -5.936972415D+00   1.775923803D+00  -3.553564883D-01   3.627728385D-02
+  -3.622509985D+02   9.604700918D+02  -1.143658565D+03   9.743718627D+02  -6.421053431D+02   3.324300145D+02  -1.332331194D+02   3.949715549D+01  -7.824540395D+00   7.893258667D-01
+  -1.407814558D+01   8.492391923D+01  -9.502541790D+01   7.686138931D+01  -4.839356990D+01   2.405556191D+01  -9.295445314D+00   2.666997257D+00  -5.133090037D-01   5.054203262D-02
+  -1.164727515D+01   8.545299689D+01  -9.997815625D+01   8.385992769D+01  -5.442903415D+01   2.776762017D+01  -1.097448312D+01   3.211437624D+00  -6.288286886D-01   6.283449614D-02
+  -1.687748698D+01   1.028010446D+02  -1.238664331D+02   1.071717187D+02  -7.180018130D+01   3.780262728D+01  -1.540760853D+01   4.644736515D+00  -9.357971606D-01   9.609222697D-02
+   8.494747863D+00   3.960698314D+01  -4.681778473D+01   3.996576363D+01  -2.646640094D+01   1.379015955D+01  -5.567914210D+00   1.664309818D+00  -3.328021470D-01   3.395470456D-02