Merge branch 'master' of https://gitlab.irap.omp.eu/OV-GSO-DC/dustem-wrapper_idl

Annie Hughes
2 parents c7448fb2 7d3f28dc
Showing 3 changed files with 12 additions and 7 deletions Show diff stats
src/idl/dustem_compute_polsed.pro
src/idl/dustem_mask_data.pro
src/idl/dustem_plot_nuinu_em.pro
@@ -175,7 +175,7 @@ IF count_spec NE 0 THEN dustem_polsed(ind_spec)=interpol(P_spec,st.polsed.wav,((
  
 ;GENERATING THE INTERPOLATES FOR POLFRAC (dustem_polfrac)
 if !run_lin then begin
-    
+    ;stop
     if not keyword_set(dustem_sed) then dustem_sed = dustem_compute_sed(p_dim,st=st,SED_spec=SED_spec)
  
     If n_elements(dustem_sed) ne n_elements(dustem_polsed) then begin                            
@@ -9,7 +9,7 @@
 ; CALLING SEQUENCE:
 ;    data_struct=dustem_mask_data(data_struct,omit=,data_set=)
 ; INPUTS:
-;    data_struct=read_xcat(file,/silent). Data structure formatted as outlined in the DustermWrap Users' Guide
+;    data_struct : SED Data structure formatted as outlined in the DustermWrap Users' Guide
 ;    data_set : Array of character strings containing the different data sets to be filtered.
 ;    ie: ['SED'],['QSED'],'USED'] or just ['QSED'] for example. The use of ['STOKESI','STOKESQ','STOKESU'] instead is equivalent.
 ;    omit : Can be an array or list. In both cases it should contain the filter names as character strings. 
@@ -86,8 +86,11 @@ defsysv,&#39;!dustem_data&#39;,exists=exists
  
 IF exists THEN BEGIN
    IF ptr_valid((*!dustem_data).sed) THEN BEGIN
-     ind_filt=where((*!dustem_data).sed.filt_names NE 'SPECTRUM',count_filt)
-     ind_spec=where((*!dustem_data).sed.filt_names EQ 'SPECTRUM',count_spec)
+     sed=(*(*!dustem_data).sed)
+     stop
+
+     ind_filt=where(sed.filt_names NE 'SPECTRUM',count_filt)
+     ind_spec=where(sed.filt_names EQ 'SPECTRUM',count_spec)
  
      ;=== Plot the data
      ;use_col_data_spec=255
@@ -97,13 +100,15 @@ IF exists THEN BEGIN
      IF count_spec NE 0 THEN BEGIN
        ;plotsym,0,/fill
        ;oplot,((*!dustem_data.sed).wav)(ind_spec),((*!dustem_data.sed).values)(ind_spec)*(3.e8/1.e-6/(*!dustem_data.sed).wav(ind_spec))/1.d20,psym=8,_extra=extra,color=use_col_data_spec,syms=0.5
-       cgoplot,((*!dustem_data).sed.wav)[ind_spec],((*!dustem_data).sed.values)[ind_spec]*(3.e8/1.e-6/(*!dustem_data).sed.wav[ind_spec])/1.d20,psym='Filled Circle',_extra=extra,color=use_col_data_spec
-       err_bar,((*!dustem_data).sed.wav)(ind_spec),((*!dustem_data).sed.values)(ind_spec)*(3.e8/1.e-6/(*!dustem_data).sed.wav(ind_spec))/1.d20,yrms=3.*((*!dustem_data).sed.sigma)(ind_spec)/2.*(3.e8/1.e-6/(*!dustem_data).sed.wav(ind_spec))/1.d20,color=use_col_data_spec
+       ;cgoplot,(sed.wav)[ind_spec],((sed.values)[ind_spec])*(3.e8/1.e-6/(sed.wav[ind_spec])/1.d20,psym='Filled Circle',_extra=_extra,color=use_col_data_spec
+       ;err_bar,(sed.wav)[ind_spec],((sed.values)[ind_spec])*(3.e8/1.e-6/(sed.wav[ind_spec])/1.d20,yrms=3.*(sed.sigma)[ind_spec]/2.*(3.e8/1.e-6/(sed.wav[ind_spec])/1.d20,color=use_col_data_spec
      ENDIF
      IF count_filt NE 0 THEN BEGIN
+       stop
        plotsym,0,/fill
+       facts=3.e8/1.e-6/(sed.wav[ind_filt])/1.d20
        ;oplot,((*!dustem_data.sed).wav)(ind_filt),((*!dustem_data.sed).values)(ind_filt)*(3.e8/1.e-6/(*!dustem_data.sed).wav(ind_filt))/1.d20,psym=8,_extra=extra,color=use_col_data_filt
-       cgoplot,((*!dustem_data).sed.wav)(ind_filt),((*!dustem_data).sed.values)(ind_filt)*(3.e8/1.e-6/(*!dustem_data).sed.wav(ind_filt))/1.d20,psym=8,_extra=extra,color=use_col_data_filt
+       cgoplot,(sed.wav)[ind_filt],(sed.values)[ind_filt]*facts,psym=8,_extra=_extra,color=use_col_data_filt
        err_bar,((*!dustem_data).sed.wav)(ind_filt),((*!dustem_data).sed.values)(ind_filt)*(3.e8/1.e-6/(*!dustem_data).sed.wav(ind_filt))/1.d20,yrms=3.*((*!dustem_data).sed.sigma)(ind_filt)/2*(3.e8/1.e-6/(*!dustem_data).sed.wav(ind_filt))/1.d20,color=use_col_data_filt
      ENDIF
    ENDIF