--- v01-17-11.ORIG/MarlinReco/v01-16/Analysis/RecoMCTruthLink/src/RecoMCTruthLinker.cc 2016-12-27 23:42:22.000000000 +0900 +++ v01-17-11/MarlinReco/v01-16/Analysis/RecoMCTruthLink/src/RecoMCTruthLinker.cc 2016-12-28 08:31:46.000000000 +0900 @@ -951,9 +951,15 @@ for ( unsigned kkk=0 ; kkk < mother->getDaughters().size() ; kkk++ ) { MCParticle* sister = dynamic_cast(mother->getDaughters()[kkk]); if ( sister == this_Kid ) continue; +#if 0 //KF if ( abs(sister->getVertex()[0]-this_Kid->getVertex()[0]) > 0.1 || abs(sister->getVertex()[1]-this_Kid->getVertex()[1]) > 0.1 || abs(sister->getVertex()[2]-this_Kid->getVertex()[2]) > 0.1 ) continue; // must check that it is the same vertex: +#else + if ( fabs(sister->getVertex()[0]-this_Kid->getVertex()[0]) > 0.1 || + fabs(sister->getVertex()[1]-this_Kid->getVertex()[1]) > 0.1 || + fabs(sister->getVertex()[2]-this_Kid->getVertex()[2]) > 0.1 ) continue; // must check that it is the same vertex: +#endif // several "non-destructive interactions" can // take place (think delta-rays !) if ( sister->isBackscatter()) { diff -uNr v01-17-11.ORIG/MarlinReco/v01-16/Analysis/TrueJet/src/TrueJet.cc v01-17-11/MarlinReco/v01-16/Analysis/TrueJet/src/TrueJet.cc --- v01-17-11.ORIG/MarlinReco/v01-16/Analysis/TrueJet/src/TrueJet.cc 2016-12-27 23:41:28.000000000 +0900 +++ v01-17-11/MarlinReco/v01-16/Analysis/TrueJet/src/TrueJet.cc 2016-12-28 08:38:58.000000000 +0900 @@ -493,9 +493,17 @@ str_tmom[i]=0. ; str_tmomS[i]=0. ; str_mom[i]=0. ; } if ( masssq_t > 0. ) { +#if 0 //KF if ( abs( sqrt(masssq_t)- p[k[elementon[ijet]][4]][5] )/ p[k[elementon[ijet]][4]][5] > 0.001 ) { +#else + if ( fabs( sqrt(masssq_t)- p[k[elementon[ijet]][4]][5] )/ p[k[elementon[ijet]][4]][5] > 0.001 ) { +#endif if ( type[ijet]%100 == 1 && type[ijet-1]%100 == 1 && nfsr[ijet]+nfsr[ijet-1]==0) { +#if 0 //KF if ( abs( tE[ijet]+tE[ijet-1]- p[k[elementon[ijet]][4]][4] )/ p[k[elementon[ijet]][4]][4] > 0.001 ) { +#else + if ( fabs( tE[ijet]+tE[ijet-1]- p[k[elementon[ijet]][4]][4] )/ p[k[elementon[ijet]][4]][4] > 0.001 ) { +#endif streamlog_out(ERROR) << " bad match M (sum/initial) " << " " << sqrt(masssq_t) << " / " << p[k[elementon[ijet]][4]][5] << std::endl; streamlog_out(ERROR) << " E (sum/initial) " << " " << tE[ijet]+tE[ijet-1] << " / " << p[k[elementon[ijet]][4]][4] << std::endl; @@ -537,7 +545,11 @@ for ( int jj= k[kk][4] ; jj <= k[kk][5] ; jj++ ) { e_kid+=p[jj][4]; } +#if 0 //KF if ( (abs(e_kid - p[kk][4])/ p[kk][4] ) > 0.001 ) { +#else + if ( (fabs(e_kid - p[kk][4])/ p[kk][4] ) > 0.001 ) { +#endif streamlog_out(WARNING) << kk << " " << k[kk][4] << " " << k[kk][5] << " " << e_kid << " " << p[kk][4] << std::endl ; } } @@ -1089,7 +1101,11 @@ int parent1=k[line94][3] ; int parent2=k[line94][6] ; int kid1=k[line94][4] ; int kid2=k[line94][5] ; if ( parent1 != 0 && parent2 != 0 ) { +#if 0 //KF if ( abs((p[kid1][4]+p[kid2][4])-(p[parent1][4]+p[parent2][4]))/(p[parent1][4]+p[parent2][4]) > 0.0001 ) { +#else + if ( fabs((p[kid1][4]+p[kid2][4])-(p[parent1][4]+p[parent2][4]))/(p[parent1][4]+p[parent2][4]) > 0.0001 ) { +#endif streamlog_out(WARNING) << " Inconsitent 94 object: Energy of parents = "<< p[kid1][4]+p[kid2][4] << " , of kids = " << p[parent1][4]+p[parent2][4] << std::endl; streamlog_out(WARNING) << " parents: " << parent1 << " " << parent2 << ". Kids: " << kid1 << " " << kid2 << std::endl; streamlog_out(WARNING) << " pdgs: " << k[parent1][2] << " " << k[parent2][2] << ". Kids: " << k[kid1][2] << " " << k[kid2][2] << std::endl; @@ -1919,7 +1935,11 @@ for ( int jj=k[i][4] ; jj <= k[i][5] ; jj++ ) { Ekid+= p[jj][4]; } +#if 0 //KF if ( abs(Ekid-p[i][4])/p[i][4] > 0.001 ) { +#else + if ( fabs(Ekid-p[i][4])/p[i][4] > 0.001 ) { +#endif streamlog_out(WARNING) << " Particle " << i << " has energy " << p[i][4] << " , but the sum of its genstat1 kids is " << Ekid << std::endl; streamlog_out(WARNING) << " indicating that Geant did something fishy and un-documented in MCParticle " @@ -2219,7 +2239,11 @@ k[line][2] == k[k[Candidate_94s[ipi]][5]][2] ) || (k[mothers][2] == k[k[Candidate_94s[ipi]][5]][2] && k[line][2] == k[k[Candidate_94s[ipi]][4]][2] )) && +#if 0 //KF ( abs(Ekids- Eparents)/Ekids < 0.0001 ) ) { +#else + ( fabs(Ekids- Eparents)/Ekids < 0.0001 ) ) { +#endif // Right flavour, right mass : say no more diff -uNr v01-17-11.ORIG/MarlinReco/v01-16/Analysis/TrueJet_Parser/src/TrueJet_Parser.cc v01-17-11/MarlinReco/v01-16/Analysis/TrueJet_Parser/src/TrueJet_Parser.cc --- v01-17-11.ORIG/MarlinReco/v01-16/Analysis/TrueJet_Parser/src/TrueJet_Parser.cc 2016-12-27 23:42:18.000000000 +0900 +++ v01-17-11/MarlinReco/v01-16/Analysis/TrueJet_Parser/src/TrueJet_Parser.cc 2016-12-28 08:33:41.000000000 +0900 @@ -52,7 +52,11 @@ for ( unsigned kk=0 ; kk(mcpvec[kk]); if ( _COUNT_FSR ) { +#if 0 //KF if ( abs(www[kk]) == 1.0) { +#else + if ( fabs(www[kk]) == 1.0) { +#endif E+=mcp->getEnergy(); } } else { @@ -81,7 +85,11 @@ for ( unsigned kk=0 ; kk(mcpvec[kk]); if ( _COUNT_FSR ) { +#if 0 //KF if ( abs(www[kk]) == 1.0) { +#else + if ( fabs(www[kk]) == 1.0) { +#endif const double* mom = mcp->getMomentum(); for (int kk=0 ; kk<3 ; kk++ ) { p3[kk]+=mom[kk]; diff -uNr v01-17-11.ORIG/MarlinReco/v01-16/Analysis/TruthVertexFinder/src/MCOperator.cc v01-17-11/MarlinReco/v01-16/Analysis/TruthVertexFinder/src/MCOperator.cc --- v01-17-11.ORIG/MarlinReco/v01-16/Analysis/TruthVertexFinder/src/MCOperator.cc 2016-12-27 23:42:17.000000000 +0900 +++ v01-17-11/MarlinReco/v01-16/Analysis/TruthVertexFinder/src/MCOperator.cc 2016-12-28 08:41:31.000000000 +0900 @@ -630,7 +630,11 @@ << " teta: " << eta << " offset: " << offset << '\n'; +#if 0 //KF if (offset > 0.01 && abs(eta) < 4 && p > 0.6) +#else + if (offset > 0.01 && fabs(eta) < 4 && p > 0.6) +#endif { filtered.push_back(daughter); }