From 8552fdbf7fcb557ab996c962a98e07f6e309728c Mon Sep 17 00:00:00 2001
From: Andrew Strong <aws@olga4.opt.rzg.mpg.de>
Date: Wed, 24 Jun 2020 18:37:39 +0200
Subject: [PATCH] SourcePopulation.cc cleanup, SourcePopulation.h add
galdef_ID, psfile_tag, not yet used
---
source/SourcePopulation.cc | 23 ++++++++++-------------
source/SourcePopulation.h | 4 ++++
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/source/SourcePopulation.cc b/source/SourcePopulation.cc
index c431630..4944ca0 100644
--- a/source/SourcePopulation.cc
+++ b/source/SourcePopulation.cc
@@ -1570,28 +1570,25 @@ int SourcePopulation::analyse_sample()
*txt_stream<<"; idl format";
*txt_stream<<endl;
- *txt_stream<<"set_plot,'ps' ;idl"<<endl;
+
// *txt_stream<<"device,file='"<<title<<".ps' ;idl"<<endl;
if(IDL_plot_control==1) // start plot
- *txt_stream<<"device,file='"<<"sourcepop_NS"<<".ps' ;idl"<<endl;
-
- *txt_stream<<"!p.font=0 ;idl"<<endl;
-
- // *txt_stream<<"start_plot =1 ; idl"<<endl;
-
- // psym -6 open squares with line
-
- // *txt_stream<<"if(start_plot eq 1) then plot,S,NS,/xlog,/ylog,xrange=[1e-13,1e-5],yrange=[0.1,1e4], xstyle=1,ystyle=1, psym=-6, xtitle='S, cm!e-2!n s!e-1!n',ytitle='N(S)', charsize=0.75,title='"<<title<<"' ; idl"<<endl;
+ {
+ *txt_stream<<"set_plot,'ps' ;idl"<<endl;
+ *txt_stream<<"device,file='"<<"sourcepop_NS"<<".ps' ;idl"<<endl;
+ *txt_stream<<"!p.font=0 ;idl"<<endl;
+ }
+
if(IDL_plot_control==1) // start plot
- *txt_stream<<"plot,S,NS,/xlog,/ylog,xrange=[1e-13,1e-5],yrange=[0.1,1e4], xstyle=1,ystyle=1, psym="<<IDL_psym<<", xtitle='S, cm!e-2!n s!e-1!n',ytitle='N(S)', charsize=0.75,title='"<<title<<"' ; idl"<<endl;
+ *txt_stream<<"plot,S,NS,/xlog,/ylog,xrange=[1e-13,1e-5],yrange=[0.1,1e4], xstyle=1,ystyle=1, psym="<<IDL_psym<<", xtitle='S, cm!e-2!n s!e-1!n',ytitle='N(S)', charsize=1.5,title='"<<title<<"',/nodata ; idl"<<endl;
+
- // *txt_stream<<"start_plot =0; idl";
- if(IDL_plot_control==2) // overplot on start plot
+ if(IDL_plot_control==1||IDL_plot_control==2) // overplot on start plot
*txt_stream<<"oplot,S,NS,psym="<<IDL_psym<<" ; idl"<<endl;
diff --git a/source/SourcePopulation.h b/source/SourcePopulation.h
index 9ded3e8..ec3d03e 100644
--- a/source/SourcePopulation.h
+++ b/source/SourcePopulation.h
@@ -16,6 +16,10 @@ class SourcePopulation
char title[200]; //AWS20140102 was 100
+ char galdef_ID [200]; //AWS20200624
+ char psfile_tag[200]; //AWS20200624
+
+
int luminosity_function_type;// luminosity-function: 1=delta-function, 2=power-law
double L; // luminosity if delta-function
--
GitLab