diff --git a/source/Galplot.cc b/source/Galplot.cc index 30703cf0cd8b71935b403f785ef4ac949f94d32a..faf584e2528bd43c7a4578970b402ad45e1d2a08 100644 --- a/source/Galplot.cc +++ b/source/Galplot.cc @@ -52,9 +52,12 @@ int Galplot::run(int argc, char*argv[]) if(create_galaxy() !=0) return 1; - if(galplotdef.verbose==-4000 || galplotdef.verbose==-4001|| galplotdef.verbose==-4002 ) + if(galplotdef.verbose==-4000 || galplotdef.verbose==-4001|| galplotdef.verbose==-4002 ) //AWS20200716 -4000 sourcepop no long cout printout { - cout<<"Only gen_source_population"<<endl;gen_source_population(); plot_source_population_NS(); + cout<<"galplotdef.verbose="<<galplotdef.verbose; + cout<<": Only gen_source_population"<<endl; + gen_source_population(); + plot_source_population_NS(); cout<<"Finished gen_source_population"<<endl;exit(0); }//AWS20110829 diff --git a/source/SourcePopulation.cc b/source/SourcePopulation.cc index 650342ffa2b184be8f097def04529fe4acae43bd..3d85ca8448b561b234e5863c72bd21a3ae55c123 100644 --- a/source/SourcePopulation.cc +++ b/source/SourcePopulation.cc @@ -788,11 +788,14 @@ int SourcePopulation::analyse_sample() double theta=(90-sample_b[i])*dtr; double phi = sample_l[i] *dtr; pointing pointing_=pointing(theta,phi); - cout<<"source statistics sample i="<<i<<" Fermi sensitivity l="<<sample_l[i] <<" b="<<sample_b[i] - <<" theta="<<theta<<" phi="<<phi; + + + if(verbose!=4)cout<<"source statistics sample i="<<i<<" Fermi sensitivity l="<<sample_l[i] <<" b="<<sample_b[i] + <<" theta="<<theta<<" phi="<<phi; //AWS20200716 // cout<<" interpolated value="<<healpix_skymap_Fermi_sensitivity.interpolated_value(pointing_)<<endl; flux_detection_limit_sensitivity_file = healpix_skymap_Fermi_sensitivity.interpolated_value(pointing_); //AWS20200713 was flux_detection_limit - cout<<" flux detection limit_sensitivity_file="<<flux_detection_limit_sensitivity_file<<" sample flux="<<sample_flux[i]<<endl; + + if(verbose!=4)cout<<" flux detection limit_sensitivity_file="<<flux_detection_limit_sensitivity_file<<" sample flux="<<sample_flux[i]<<endl;//AWS20200716 } dlnN_dlnS [ii]++; @@ -1061,11 +1064,13 @@ int SourcePopulation::analyse_sample() double theta=(90-sample_b[i])*dtr; double phi = sample_l[i] *dtr; pointing pointing_=pointing(theta,phi); - cout<<"skymap generation source sample i="<<i<<" Fermi sensitivity l="<<sample_l[i] <<" b="<<sample_b[i] - <<" theta="<<theta<<" phi="<<phi; + + if(verbose!=4)cout<<"skymap generation source sample i="<<i<<" Fermi sensitivity l="<<sample_l[i] <<" b="<<sample_b[i] + <<" theta="<<theta<<" phi="<<phi; //AWS20200716 // cout<<" interpolated value="<<healpix_skymap_Fermi_sensitivity.interpolated_value(pointing_)<<endl; flux_detection_limit_sensitivity_file = healpix_skymap_Fermi_sensitivity.interpolated_value(pointing_); //AWS20200713 - cout<<" flux detection limit_sensitivity_file="<<flux_detection_limit_sensitivity_file<<" sample flux="<<sample_flux[i]<<endl; + + if(verbose!=4)cout<<" flux detection limit_sensitivity_file="<<flux_detection_limit_sensitivity_file<<" sample flux="<<sample_flux[i]<<endl;//AWS20200716 } ii=int( (log10(sample_flux[i])-lnS_min)/dlnS );