From 3c33391b22290c2395cfa2a06512994eb57a0456 Mon Sep 17 00:00:00 2001
From: Annie Hughes <annie.hughes@irap.omp.eu>
Date: Mon, 29 Apr 2024 14:25:23 +0200
Subject: [PATCH] modifs for K15 and Y19 aggregates

---
 src/idl/dustem_init.pro              | 40 +++++++++++++++++++++++++++++++++++++++-
 src/idl/dustem_read_qabs_lv.pro      |  8 ++++++--
 src/idl/dustem_test_model_exists.pro | 12 ++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/idl/dustem_init.pro b/src/idl/dustem_init.pro
index 399a440..a6d23c9 100644
--- a/src/idl/dustem_init.pro
+++ b/src/idl/dustem_init.pro
@@ -382,6 +382,15 @@ CASE use_model OF
       'AJ13':BEGIN              ; for backwards compatibility
          (*!dustem_inputs).grain='GRAIN_J13.DAT'
       END
+      'K15_AMMI':BEGIN
+         (*!dustem_inputs).grain='GRAIN_AMMI_K15.DAT'
+      END
+      'K15_AMMK':BEGIN
+         (*!dustem_inputs).grain='GRAIN_AMMk_K15.DAT'
+      END
+      'K15_CMM':BEGIN
+         (*!dustem_inputs).grain='GRAIN_CMM_K15.DAT'
+      END
       'G17_MODELA':BEGIN
          (*!dustem_inputs).grain='GRAIN_G17_ModelA.DAT'
          (*!dustem_inputs).align='ALIGN_G17_ModelA.DAT'
@@ -398,6 +407,33 @@ CASE use_model OF
          (*!dustem_inputs).grain='GRAIN_G17_ModelD.DAT'
          (*!dustem_inputs).align='ALIGN_G17_ModelD.DAT'
       END
+      'Y19_TYP1':BEGIN
+         (*!dustem_inputs).grain='GRAIN_typ1_Y19.DAT'
+      END
+      'Y19_TYP2':BEGIN
+         (*!dustem_inputs).grain='GRAIN_typ2_Y19.DAT'
+      END
+      'Y19_TYP3':BEGIN
+         (*!dustem_inputs).grain='GRAIN_typ3_Y19.DAT'
+      END
+      'Y19_TYP4':BEGIN
+         (*!dustem_inputs).grain='GRAIN_typ4_Y19.DAT'
+         END
+      'Y19_TYP5':BEGIN
+         (*!dustem_inputs).grain='GRAIN_typ5_Y19.DAT'
+      END
+      'Y19_TYP6':BEGIN
+         (*!dustem_inputs).grain='GRAIN_typ6_Y19.DAT'
+      END
+      'Y19_TYP7':BEGIN
+         (*!dustem_inputs).grain='GRAIN_typ7_Y19.DAT'
+      END
+      'Y19_TYP8':BEGIN
+         (*!dustem_inputs).grain='GRAIN_typ8_Y19.DAT'
+      END
+      'Y19_TYP9':BEGIN
+         (*!dustem_inputs).grain='GRAIN_typ9_Y19.DAT'
+      END
       'Y24':BEGIN            
          (*!dustem_inputs).grain='GRAIN_Y24.DAT'
          (*!dustem_inputs).align='ALIGN_Y24.DAT'
@@ -556,7 +592,9 @@ IF keyword_set(wraptest) THEN BEGIN
   xtit=textoidl('\lambda (\mum)')
   ytit=textoidl('\nuI_\nu^{em} (W/m^2/sr for N_H=1.e20 H/cm^2)')
   yr=[1e-11,6.e-7]
-  xr=[1,5e3]
+  ;yr=[1e-21,6.e-7] ; needed for aggregates
+  xr=[1,5.e3]
+  ;xr=[1,500.e3]  ; needed for aggregates
   dustem_plot_nuinu_em,st,yr=yr,/ysty,xr=xr,/xsty,/xlog,/ylog,title=tit,xtit=xtit,ytit=ytit
 ENDIF
 
diff --git a/src/idl/dustem_read_qabs_lv.pro b/src/idl/dustem_read_qabs_lv.pro
index c34d358..c477bfa 100755
--- a/src/idl/dustem_read_qabs_lv.pro
+++ b/src/idl/dustem_read_qabs_lv.pro
@@ -1,4 +1,6 @@
-FUNCTION dustem_read_qabs_lv,file,silent=silent,read_densities=read_densities
+FUNCTION dustem_read_qabs_lv,file,silent=silent,read_densities=read_densities $
+                             ,qabs_values=qabs_values $
+                             ,qsca_values=qsca_values 
 
 ;+
 ; NAME:
@@ -23,7 +25,9 @@ FUNCTION dustem_read_qabs_lv,file,silent=silent,read_densities=read_densities
 ;    st   : dustem data structure
 ;
 ; OPTIONAL OUTPUT PARAMETERS:
-;
+;    qabs_values : values of qabs read from file [Nsize x Nwav]
+;    qsca_values : values of qsca read from file [Nsize x Nwav]
+;  
 ; ACCEPTED KEY-WORDS:
 ;    read_densities : if grain densities are size-dependent they should be
 ;    read here
diff --git a/src/idl/dustem_test_model_exists.pro b/src/idl/dustem_test_model_exists.pro
index daddff8..29f07fc 100644
--- a/src/idl/dustem_test_model_exists.pro
+++ b/src/idl/dustem_test_model_exists.pro
@@ -74,12 +74,24 @@ function dustem_test_model_exists,model $
               ,'DL07' $
               ,'J13' $
               ,'AJ13' $ ; for backwards compatibility = J13
+              ,'K15_AMMI' $
+              ,'K15_AMMK' $
+              ,'K15_CMM' $
               ,'G17_MODELA' $
               ,'G17_MODELB' $
               ,'G17_MODELC' $
               ,'G17_MODELD' $
               ,'THEMIS' $ ; for convenience = J13
               ,'THEMIS2' $ ; for convenience = Y24
+              ,'Y19_TYP1' $
+              ,'Y19_TYP2' $
+              ,'Y19_TYP3' $
+              ,'Y19_TYP4' $
+              ,'Y19_TYP5' $
+              ,'Y19_TYP6' $
+              ,'Y19_TYP7' $
+              ,'Y19_TYP8' $
+              ,'Y19_TYP9' $
               ,'Y24' $
               ,'HD22' $ 
               ,'ASTRODUST' $  ; for convience = HD22
--
libgit2 0.21.2