diff --git a/applications/pctpaircuts/pctpaircuts.cxx b/applications/pctpaircuts/pctpaircuts.cxx index 11ccc49..8cb1554 100644 --- a/applications/pctpaircuts/pctpaircuts.cxx +++ b/applications/pctpaircuts/pctpaircuts.cxx @@ -5,10 +5,6 @@ #include #include "pctProtonPairsToDistanceDrivenProjection.h" -#include "pctThirdOrderPolynomialMLPFunction.h" -#include "pctSchulteMLPFunction.h" -#include "pctEnergyStragglingFunctor.h" -#include "pctBetheBlochFunctor.h" #include #include @@ -51,10 +47,6 @@ main(int argc, char * argv[]) std::vector> energies(npixels); std::vector> angles(npixels); - pct::Functor::IntegratedBetheBlochProtonStoppingPowerInverse * ConvFunc; - ConvFunc = new pct::Functor::IntegratedBetheBlochProtonStoppingPowerInverse( - 68.9984 * CLHEP::eV, 600. * CLHEP::MeV, 0.1 * CLHEP::keV); - // Read pairs using VectorType = itk::Vector; using PairsImageType = itk::Image; @@ -312,17 +304,6 @@ main(int argc, char * argv[]) const double angley = std::acos(std::min(1., dInY * dOutY / (dInY.GetNorm() * dOutY.GetNorm()))); const double energy = (data[0] == 0.) ? data[1] : data[0] - data[1]; - VectorType WET_data; - if (args_info.wet_flag) - { - WET_data[0] = ConvFunc->GetValue(data[1], data[0]); - } - else - WET_data[0] = data[0]; - - WET_data[1] = data[1]; - WET_data[2] = data[2]; - if (anglex <= pSumAngleSq[idx] && angley <= pSumAngleSq[idx] && std::abs(energy - pSumEnergy[idx]) <= pSumEnergySq[idx]) { @@ -332,7 +313,7 @@ main(int argc, char * argv[]) pairs.push_back(pOut); pairs.push_back(dIn); pairs.push_back(dOut); - pairs.push_back(WET_data); + pairs.push_back(data); if (region.GetSize(0) == 6) pairs.push_back(nuclearinfo); } @@ -342,7 +323,7 @@ main(int argc, char * argv[]) pairs.push_back(pOut); pairs.push_back(dIn); pairs.push_back(dOut); - pairs.push_back(WET_data); + pairs.push_back(data); if (region.GetSize(0) == 6) pairs.push_back(nuclearinfo); } @@ -352,7 +333,7 @@ main(int argc, char * argv[]) pairs.push_back(pOut); pairs.push_back(dIn); pairs.push_back(dOut); - pairs.push_back(WET_data); + pairs.push_back(data); if (region.GetSize(0) == 6) pairs.push_back(nuclearinfo); } diff --git a/applications/pctpaircuts/pctpaircuts.ggo b/applications/pctpaircuts/pctpaircuts.ggo index f281d15..2f20103 100644 --- a/applications/pctpaircuts/pctpaircuts.ggo +++ b/applications/pctpaircuts/pctpaircuts.ggo @@ -11,7 +11,6 @@ option "robust" r "Use robust estimation using 50/19.1 %ile." flag of option "robustopt" - "Use newer options for robust cut." int no default="0" option "primaries" - "Consider only primary protons" flag off option "nonuclear" - "Consider only primary protons without nuclear interactions" flag off -option "wet" - "Write WET instead of initial energy" flag off section "Projections parameters" option "origin" - "Origin (default=centered)" double multiple no