Commit 5bf1b7da authored by Andrew Strong's avatar Andrew Strong

SourcePopulation.cc: use print_ctl to control catalogue print to cout....

SourcePopulation.cc: use print_ctl to control catalogue print to cout. Galplotdef.cc .h:  sourcepop1.print_ctl. gen_source_populatin.cc: sourcepop1.print_ctl from galplotdef
parent 7c9a9900
......@@ -461,6 +461,11 @@ int Galplotdef::read(char *version_, char *run_no_, char *galdef_directory)
strcpy(parstring, "sourcepop1_verbose" );//AWS20051109
stat= read_galdef_parameter(filename,parstring,&sourcepop1_verbose );//AWS20051109
sourcepop1_print_ctl = 0; //AWS20200721
strcpy(parstring, "sourcepop1_print_ctl" );//AWS20200721
stat= read_galdef_parameter(filename,parstring,&sourcepop1_print_ctl );//AWS20200721
strcpy(parstring, "sourcepop1_density0" );//AWS20051109
stat= read_galdef_parameter(filename,parstring,&sourcepop1_density0 );//AWS20051109
......@@ -985,6 +990,7 @@ void Galplotdef::print()
cout<<" verbose "<<verbose <<endl;
cout<<" test_suite "<<test_suite <<endl;
cout<<" psfile_tag "<<psfile_tag <<endl;
cout<<" screen_output "<<screen_output<<endl;
......@@ -1087,6 +1093,7 @@ void Galplotdef::print()
cout<<" spiskymax_iteration "<< spiskymax_iteration <<endl;
cout<<" sourcepop1_verbose "<< sourcepop1_verbose <<endl;
cout<<" sourcepop1_print_ctl "<< sourcepop1_print_ctl<<endl;
cout<<" sourcepop1_density0 "<< sourcepop1_density0 <<endl;
cout<<" sourcepop1_oversample "<< sourcepop1_oversample<<endl;
cout<<" sourcepop1_L_min "<< sourcepop1_L_min <<endl;
......
......@@ -146,6 +146,7 @@ class Galplotdef
int model_ridge ; // plot ridge model
int sourcepop1_verbose ; // source population parameters AWS20050911
int sourcepop1_print_ctl; // control output of sources to cout AWS20200721
double sourcepop1_density0 ;
double sourcepop1_oversample;// source oversampling to avoid statistical fluctuations AWS20060109
double sourcepop1_L_min ;
......
......@@ -143,7 +143,8 @@ int SourcePopulation::print(int options) // default options=1 in header
*txt_stream<<"galdef_ID=" <<galdef_ID<<endl; //AWS20200701
*txt_stream<<"psfile_tag="<<psfile_tag<<endl; //AWS20200701
*txt_stream<<"verbose=" <<verbose <<endl; //AWS20200721
*txt_stream<<"print_ctl=" <<print_ctl<<endl; //AWS20200721
}
......@@ -2346,6 +2347,7 @@ cout<<"FITS movabs_hdu hdunum="<<hdunum<<" status= "<<status<<" hdutype="<<hduty
init();
verbose =sourcepop.verbose;
print_ctl =sourcepop.print_ctl; //AWS20200721
luminosity_function_type=sourcepop.luminosity_function_type;
L =sourcepop.L;
density0 =sourcepop.density0;
......
......@@ -114,6 +114,8 @@ int Galplot::gen_source_population()
// these parameters from galplotdef file
sourcepop1.verbose =galplotdef.sourcepop1_verbose;
sourcepop1.print_ctl =galplotdef.sourcepop1_print_ctl; //AWS20200721
sourcepop1.density0 =galplotdef.sourcepop1_density0;
sourcepop1.oversample=galplotdef.sourcepop1_oversample; //AWS20060118
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment