diff --git a/pub/src/edif.cpp b/pub/src/edif.cpp
index 536701a3a25424535d0cba3aae8ea852eb51dfc6..f944c49169f34d9a16cbe12e6060097ea536c194 100644
--- a/pub/src/edif.cpp
+++ b/pub/src/edif.cpp
@@ -73,7 +73,9 @@ void NEdif::showFiles()
txtpts = str( format( "%-6d" ) % npts );
else
txtpts = " ?";
- xytext = txtpts + f->xco.str_compact(12) + " " + f->yco.str_compact(12);
+ xytext = txtpts +
+ f->xco.str_compact(12) + " " +
+ f->yco.str_compact(12);
} else if ( fc ) {
xytext = fc->expr.substr(0,25);
}
diff --git a/pub/src/file_in.cpp b/pub/src/file_in.cpp
index 64814f0203cbe7f3becc3de4e4b61cb9c1a936af..372363870b0a9c80df9669948365be2a01d32f95 100644
--- a/pub/src/file_in.cpp
+++ b/pub/src/file_in.cpp
@@ -337,7 +337,9 @@ void NFileIn::Load_01( FILE *F_in, string flong )
if( ji>=20 || !triv::any2dbl( in.substr(ji,20), &dval ) )
throw "invalid rpa line\n";
fout->RPar.push_back( CParam( CCoord(), dval ) );
- throw "a01 file contains rpa section. Check the source code preceeding this error message. It is possibly broken. If not, remove this exception.";
+ throw "a01 file contains rpa section. "
+ "Check the source code preceeding this error message. "
+ "It is possibly broken. If not, remove this exception.";
} else if (key=="#j ") {
if ( sscanf(val.c_str(), "%i", &nj)!=1 )
throw "after key #j no no. of spectra";
@@ -539,7 +541,6 @@ void NFileIn::Load_96( FILE *F_in, string flong )
}
fout->V.push_back( sout );
-
}
fout->as_on_disk = true;
diff --git a/pub/src/frida2.cpp b/pub/src/frida2.cpp
index 296e230a03b90f21700c19159c44ff8ae3a23671..1745d33626d6c669dd6f0f8f65a6658f1378cd21 100644
--- a/pub/src/frida2.cpp
+++ b/pub/src/frida2.cpp
@@ -12,14 +12,20 @@
//! Homepage: http://apps.jcns.fz-juelich.de/frida
//!
//! Useful entry points in this source documentation:
-//! - initializations, main loop: <a href="frida2_8cpp_source.html">frida2.cpp</a>
-//! - commands: <a href="commands_8cpp_source.html">commands.cpp</a>
-//! - online memory: <a href="namespaceNOlm.html">namespace NOlm</a>
-//! - data model root: <a href="classCOlo.html">class COlo</a>
+//! - initializations, main loop:
+//! <a href="frida2_8cpp_source.html">frida2.cpp</a>
+//! - commands:
+//! <a href="commands_8cpp_source.html">commands.cpp</a>
+//! - online memory:
+//! <a href="namespaceNOlm.html">namespace NOlm</a>
+//! - data model root:
+//! <a href="classCOlo.html">class COlo</a>
//!
//! Used libraries:
-//! - Minor utilities: <a href="../frida-libs/trivia/index.html">libtrivia</a>
-//! - Dialogue interface: <a href="../frida-libs/read-plus/index.html">libread-plus</a>
+//! - Minor utilities:
+//! <a href="../frida-libs/trivia/index.html">libtrivia</a>
+//! - Dialogue interface:
+//!! <a href="../frida-libs/read-plus/index.html">libread-plus</a>
#include <cstdlib>
#include <iostream>
diff --git a/pub/src/func.cpp b/pub/src/func.cpp
index ed066cd4dd08a761e0abd5ef8f6653131229d367..a8dff18d92301a851ebf5fbbf1488dc53f5ce9d4 100644
--- a/pub/src/func.cpp
+++ b/pub/src/func.cpp
@@ -209,14 +209,14 @@ double func_re_wz( double x, double y ){
double func_cond(double v, double a, double b) { return v ? a : b; }
void deri_cond(double& r, double& dr, double v, double dv,
- double a, double da, double b, double db)
+ double a, double da, double b, double db)
{ if(v) { r=a; dr=da; } else { r=b; dr=db; } }
double func_q4w( double hbarw, double Ei, double twotheta) {
// calculate Q in Angstroem-1 when hbar*w and E_i are given in meV
if( hbarw>Ei ) return -1;
return sqrt( (1/2.07212349) *
- ( 2*Ei-hbarw-2*sqrt(Ei*(Ei-hbarw))*cos(twotheta*TWOPI/360) ) );
+ ( 2*Ei-hbarw-2*sqrt(Ei*(Ei-hbarw))*cos(twotheta*TWOPI/360) ) );
}
double func_cauchy2 (double x, double p, double w) {
@@ -449,49 +449,49 @@ void NFunctions::initialize(void)
CFunc( "j0", func_j0, 0, 0,
"(x): spherical Bessel function x" ).register_me();
CFunc( "gamma",func_gamma, 0, 0,
- "(x): gamma function of x (i.e. factorial of x-1)" ).register_me();
+ "(x): gamma function of x (i.e. factorial of x-1)" ).register_me();
CFunc( "debye1",func_debye1, 0, 0,
- "(x): Debye function D1 of x" ).register_me();
+ "(x): Debye function D1 of x" ).register_me();
CFunc( "debye3",func_debye3, 0, 0,
- "(x): Debye function D3 of x" ).register_me();
+ "(x): Debye function D3 of x" ).register_me();
CFunc( "debyeui",func_debye_ui, 0, 0,
- "(x): Debye internal energy" ).register_me();
+ "(x): Debye internal energy" ).register_me();
CFunc( "debyecv",func_debye_cv, 0, 0,
- "(x): Debye heat capacity" ).register_me();
+ "(x): Debye heat capacity" ).register_me();
CFunc( "erfP", func_erfP, 0, 0,
- "(x): ?" ).register_me();
+ "(x): ?" ).register_me();
CFunc( "erfQ", func_erfQ , 0, 0,
- "(x): ?" ).register_me();
+ "(x): ?" ).register_me();
CFunc( "erf", func_erf, 0, 0,
- "(x): error function of x" ).register_me();
+ "(x): error function of x" ).register_me();
CFunc( "erfc", func_erfc, 0, 0,
- "(x): complementary error function of x" ).register_me();
+ "(x): complementary error function of x" ).register_me();
CFunc( "dawson", func_dawson, 0, 0,
- "(x): Dawson function of x" ).register_me();
+ "(x): Dawson function of x" ).register_me();
CFunc( "sinc", func_sinc, 0, 0,
- "(x): sinus cardinalis, sin(x)/x" ).register_me();
+ "(x): sinus cardinalis, sin(x)/x" ).register_me();
CFunc( "ceil", func_ceil, 0, 0,
- "(x): the smallest integer i with i>=x" ).register_me();
+ "(x): the smallest integer i with i>=x" ).register_me();
CFunc( "floor",func_floor, 0, 0,
- "(x): the largest integer i with i<=x" ).register_me();
+ "(x): the largest integer i with i<=x" ).register_me();
CFunc( "nint", func_nint, 0, 0,
- "(x): the integer nearest to x" ).register_me();
+ "(x): the integer nearest to x" ).register_me();
// f(2 args)
CFunc( "min", func_min, 0, 0,
- "(x,y): the smaller of the two arguments x and y" ).register_me();
+ "(x,y): the smaller of the two arguments x and y" ).register_me();
CFunc( "max", func_max, 0, 0,
- "(x,y): the smaller of the two arguments x and y" ).register_me();
+ "(x,y): the smaller of the two arguments x and y" ).register_me();
CFunc( "ran", func_ran, 0, 0,
- "(x,y): a random number between x and y" ).register_me();
+ "(x,y): a random number between x and y" ).register_me();
CFunc( "gauss", func_gauss, 0, 0,
"(x,s): the normalized Gaussian exp(-x^2/2/s^2)/sqrt(2 pi)/s"
).register_me();
CFunc( "gnn", func_gaussnn, 0, 0,
- "(x,s): the unnormalized Gaussian exp(-x^2/2/s^2)" ).register_me();
+ "(x,s): the unnormalized Gaussian exp(-x^2/2/s^2)" ).register_me();
CFunc( "cauchy", func_cauchy, 0, 0,
- "(x,w): the Cauchy-Lorentz function ?/(x^2+w^2)" ).register_me();
+ "(x,w): the Cauchy-Lorentz function ?/(x^2+w^2)" ).register_me();
// EXPERIMENTAL
CFunc( "imw", func_im_wz, 0, 0, "im[w(z)]" ).register_me();
@@ -499,25 +499,33 @@ void NFunctions::initialize(void)
// f(3 args)
CFunc( "q4w", func_q4w, 0, 0,
- "(x,y,z): ?" ).register_me();
+ "(x,y,z): ?" ).register_me();
CFunc( "cauchy2", func_cauchy2, 0, 0,
- "(x,y,z): ?" ).register_me();
+ "(x,y,z): ?" ).register_me();
CFunc( "kwwc", func_kwwc, 0, 0,
- "(w,tau,b): Fourier cosine transform (t->w) of exp((t/tau)^b)" ).register_me();
+ "(w,tau,b): Fourier cosine transform (t->w) of exp((t/tau)^b)"
+ ).register_me();
CFunc( "kwws", func_kwws, 0, 0,
- "(w,tau,b): Fourier sine transform (t->w) of exp((t/tau)^b)" ).register_me();
+ "(w,tau,b): Fourier sine transform (t->w) of exp((t/tau)^b)"
+ ).register_me();
CFunc( "kwwp", func_kwwp, 0, 0,
- "(w,tau,b): primitive of Fourier cosine transform (t->w) of exp((t/tau)^b)" ).register_me();
+ "(w,tau,b): primitive of "
+ "Fourier cosine transform (t->w) of exp((t/tau)^b)"
+ ).register_me();
CFunc( "voigt", func_voigt, 0, 0,
- "(x,sigma,gamma): convolution of Gaussian(x,sigma) and Lorentzian(x,gamma)" ).register_me();
+ "(x,sigma,gamma): convolution of Gaussian(x,sigma) and "
+ "Lorentzian(x,gamma)"
+ ).register_me();
CFunc( "zorn", func_zorn, 0, 0,
- "(I,<I>,s): Zorn's multiple-scattering corrected elastic intensity" ).register_me();
+ "(I,<I>,s): Zorn's multiple-scattering corrected elastic intensity"
+ ).register_me();
CFunc( "zorn2", func_zorn_gauss, 0, 0,
- "(q,<u^2>,s): Zorn's multiple-scattering corrected Gaussian elastic intensity for Si111" ).register_me();
+ "(q,<u^2>,s): Zorn's multiple-scattering corrected Gaussian "
+ "elastic intensity for Si111" ).register_me();
CFunc( "rehavneg", func_re_havneg, 0, 0,
- "(x,y,z): real part of the Havriliak-Negami function"
+ "(x,y,z): real part of the Havriliak-Negami function"
).register_me();
CFunc( "imhavneg", func_im_havneg, 0, 0,
- "(x,y,z): imaginary part of the Havriliak-Negami function"
+ "(x,y,z): imaginary part of the Havriliak-Negami function"
).register_me();
}
diff --git a/pub/src/import.cpp b/pub/src/import.cpp
index df62df60f49a21d9ffcca1e54f834a59e1a4fa88..887f3487e33a3e10ce1064c5fb39bbc851ac84ed 100644
--- a/pub/src/import.cpp
+++ b/pub/src/import.cpp
@@ -170,7 +170,8 @@ void NImport::readIn()
}
// printf ("DEBUG: size = %d\n", linv.size());
if (linv.size()<1) {
- cout << "found no z in line [" << line << "] => assuming end-of-input\n";
+ cout << "found no z in line [" << line <<
+ "] => assuming end-of-input\n";
goto store;
}
// printf ("DEBUG: val = %g\n", linv[0]);
@@ -477,7 +478,6 @@ void NImport::readTab( string qualif )
}
}
++nline;
-
} // end of file input loop
if( !horizontal && s && s->size()>0 )
@@ -526,7 +526,6 @@ void NImport::makeGrid()
// *** loop over spectra ***
for (int j=0; j<nj; ++j) {
-
PSpec s( new CSpec );
s->x.resize(ni);
diff --git a/pub/src/integrate.cpp b/pub/src/integrate.cpp
index 0ce7becd5fcef11a3bc1c8fe0a9358d8207459d9..c62413e9332abda9d506788ead076c595e0092da 100644
--- a/pub/src/integrate.cpp
+++ b/pub/src/integrate.cpp
@@ -179,14 +179,12 @@ void NCurveIntegral::integrate()
bool newoutspec = true;
for (int j=0; j<fin->nJ(); j++) {
-
if( newoutspec ) {
S = PSpec( new CSpec );
S->z = fin->VC(j)->z;
S->z.pop_back();
newoutspec = false;
}
-
// determine integral value
double val;
if ( mode=="p" )
@@ -204,13 +202,11 @@ void NCurveIntegral::integrate()
val = GridSum( fin, fiter.k(), j );
else
throw "invalid mode " + mode;
-
// print out ?
if (!savable) {
cout << fin->name << ": " << label << " = " << val << "\n";
continue;
}
-
// store in integral spectrum
S->push_xy( fin->VC(j)->z[nz-1], val );
// move z values
diff --git a/pub/src/olf.h b/pub/src/olf.h
index df455cc3ff33d9ffc707917a425b06778e3083a7..16bc1f55fc1a63370b2682d4823fd37b51cc1969 100644
--- a/pub/src/olf.h
+++ b/pub/src/olf.h
@@ -79,6 +79,7 @@ class COlc : public COlo {
vector<double> *ret, const vector<double>& vt, int k, int j ) const;
void curve_val_vec_syst(
vector<double> *ret, const vector<double>& vt, int k, int j ) const;
+
public:
// Function:
string expr; ///< The curve's definition (input expression).
diff --git a/pub/src/rssm.cpp b/pub/src/rssm.cpp
index 9eb40a287a5f097e33826aa8447833d778afed3b..3b5162c556c868a157b635f028b288f4258102d6 100644
--- a/pub/src/rssm.cpp
+++ b/pub/src/rssm.cpp
@@ -172,7 +172,8 @@ void CRawfileSpheres::RdRawYam( ifstream& F_in )
throw "DATA BUG: ChopperHistograms is not a SEQUENCE";
int nCho = doc["ChopperHistograms"].size();
for (int iCho = 0; iCho<nCho; iCho++) {
- if ( doc["ChopperHistograms"][iCho].Type() != YAML::NodeType::Sequence )
+ if ( doc["ChopperHistograms"][iCho].Type()
+ != YAML::NodeType::Sequence )
throw "DATA BUG: ChopperHistograms " + S(iCho) +
" is not a SEQUENCE";
doc["ChopperHistograms"][iCho][0] >> val;