@@ -66,9 +66,9 @@ namespace {
6666 iline = 0 ;
6767 for (isample = 0 ; ; isample++) {
6868 iline++;
69- if (!std::getline (ifs,line)) goto error_invalid_format;
70- int npart,dummy;
71- if (2 != std::sscanf (line.c_str ()," %d %d" ,&npart,&dummy)) break ;
69+ if (!std::getline (ifs, line)) goto error_invalid_format;
70+ int npart, dummy;
71+ if (2 != std::sscanf (line.c_str (), " %d %d" , &npart, &dummy)) break ;
7272
7373 if (isample == this ->m_numberOfSamples ) goto error_invalid_format;
7474
@@ -82,7 +82,7 @@ namespace {
8282 double px, py, pz, m;
8383 double x, y, z, t;
8484 if (10 != std::sscanf (
85- line.c_str ()," %d %d %lf %lf %lf %lf %lf %lf %lf %lf" ,
85+ line.c_str (), " %d %d %lf %lf %lf %lf %lf %lf %lf %lf" ,
8686 &kc, &kf, &px, &py, &pz, &m, &x, &y, &z, &t
8787 )) goto error_invalid_format;
8888
@@ -200,11 +200,11 @@ namespace {
200200 if (!ifs.read ((char *) &ks, sizeof ks)) goto error_invalid_format;
201201 if (!ifs.read ((char *) &kf, sizeof kf)) goto error_invalid_format;
202202 if (!ifs.read ((char *) &px, sizeof px)) goto error_invalid_format;
203- if (!ifs.read ((char *) &px , sizeof py)) goto error_invalid_format;
204- if (!ifs.read ((char *) &px , sizeof pz)) goto error_invalid_format;
203+ if (!ifs.read ((char *) &py , sizeof py)) goto error_invalid_format;
204+ if (!ifs.read ((char *) &pz , sizeof pz)) goto error_invalid_format;
205205 if (!ifs.read ((char *) &m, sizeof m )) goto error_invalid_format;
206206 if (!ifs.read ((char *) &x, sizeof x)) goto error_invalid_format;
207- if (!ifs.read ((char *) &t , sizeof y)) goto error_invalid_format;
207+ if (!ifs.read ((char *) &y , sizeof y)) goto error_invalid_format;
208208 if (!ifs.read ((char *) &z, sizeof z)) goto error_invalid_format;
209209 if (!ifs.read ((char *) &t, sizeof t)) goto error_invalid_format;
210210 this ->addParticleMinkowski (kf, px, py, pz, m, x, y, z, t);
0 commit comments