[Debian-astro-commits] [gyoto] 09/221: Code cleaning

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 8815ed58a4ceeacf5e2ca53c6563351bcccd5f07
Author: Frederic <frederic at MacFrederic.local>
Date:   Wed Sep 3 16:22:27 2014 +0200

    Code cleaning
---
 .gitignore                | 10 +---------
 lib/Astrobj.C             | 17 +----------------
 lib/WorldlineIntegState.C |  8 --------
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index a652e69..4db67bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,12 +24,4 @@ yorick/stdplug/polishfit.i
 yorick/yorick
 yorick/setpaths.i
 yorick/gyoto.info
-yorick/yorick1
-*.aux
-*.bbl
-*.blg
-*.log
-*.out
-*.pdf
-*.toc
-
+yorick/yorick1
\ No newline at end of file
diff --git a/lib/Astrobj.C b/lib/Astrobj.C
index 8e79052..3ffbf58 100644
--- a/lib/Astrobj.C
+++ b/lib/Astrobj.C
@@ -295,9 +295,8 @@ void Generic::processHitQuantities(Photon* ph, double* coord_ph_hit,
       double * Inu          = new double[nbnuobs];
       double * Taunu        = new double[nbnuobs];
       double * nuem         = new double[nbnuobs];
-      //      cout << "red fact= " << ggredm1 << endl;
+
       for (size_t ii=0; ii<nbnuobs; ++ii) {
-	//	cout << "i,nu= " << ii << " " << nuobs[ii] << endl;
 	nuem[ii]=nuobs[ii]*ggredm1;
       }
       GYOTO_DEBUG_ARRAY(nuobs, nbnuobs);
@@ -309,9 +308,7 @@ void Generic::processHitQuantities(Photon* ph, double* coord_ph_hit,
 	emission(Inu, nuem, nbnuobs, dsem, coord_ph_hit, coord_obj_hit);
       }
       for (size_t ii=0; ii<nbnuobs; ++ii) {
-	//cout << "i,nu= " << ii << " " << nuobs[ii] << endl;
 	inc = Inu[ii] * ph -> getTransmission(ii) * ggred*ggred*ggred;
-	//if (inc < 1.) inc = 0.; //TEST
 #       ifdef HAVE_UDUNITS
 	if (data -> spectrum_converter_)
 	  inc = (*data -> spectrum_converter_)(inc);
@@ -323,18 +320,6 @@ void Generic::processHitQuantities(Photon* ph, double* coord_ph_hit,
 	}else{
 	  ph -> transmit(ii,Taunu[ii]);
 	}
-
-	double GYOTO_C2_CGS_M1= 1.1126500560536184087938986e-21;
-	double Msgr = gg_->mass()*1e3; // cgs
-	double delta_s = 
-	  dsem*GYOTO_G_CGS*Msgr*GYOTO_C2_CGS_M1; // cgs
-	double jnu = Inu[ii]/Taunu[ii]/delta_s/GYOTO_INU_CGS_TO_SI; // cgs
-	double anu = -log(Taunu[ii])/delta_s; // cgs
-	double depth = -log(ph -> getTransmission(ii));
-	/*if (depth > 1. && depth<10.) {
-	  data->spectrum[ii*data->offset]=jnu/anu * GYOTO_INU_CGS_TO_SI * ggred*ggred*ggred; // in SI to fit the standard case
-	  }*/
-	//cout << "in astrobj, opt dep, jnu*ds, Snu, data [all cgs]= " << depth << " " << Inu[ii]/Taunu[ii]/GYOTO_INU_CGS_TO_SI << " " << jnu/anu << " " << data->spectrum[ii*data->offset]/GYOTO_INU_CGS_TO_SI << endl; 
 	 
 #       if GYOTO_DEBUG_ENABLED
 	GYOTO_DEBUG
diff --git a/lib/WorldlineIntegState.C b/lib/WorldlineIntegState.C
index 8217808..8ae18ac 100644
--- a/lib/WorldlineIntegState.C
+++ b/lib/WorldlineIntegState.C
@@ -222,14 +222,6 @@ Worldline::IntegState::Boost::init(Worldline * line,
 int Worldline::IntegState::Boost::nextStep(double coord[8], double h1max) {
   GYOTO_DEBUG << h1max << endl;
   
-  double rr=coord[1], th=coord[2], ph=coord[3];
-  //cout << "r th x y z: " <<  rr << " " << th << " " << rr*sin(th)*cos(ph) << " " << rr*sin(th)*sin(ph) << " " << rr*cos(th) << endl;
-  //cout << "t r th ph= " << setprecision(17) << coord[0] << " " << rr << " " << th << " " << ph << endl;
-  //cout << "tgt= " << coord[4] << " " << coord[5] << " " << coord[6] << " " << coord[7] << endl;
-  //cout << "norm= " << norm_ << endl;
-  //cout << setprecision(10) << coord[0] << " " << rr << endl;
-  //cout << "delta= " << delta_ << endl;
-  
   // We first make a C++ std::array out of the bare C array:
   std::array<double, 8> inout = {
     coord[0], coord[1], coord[2], coord[3],

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git