X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkOptNormalizedCorrelationImageToImageMetric.txx;h=0f8fa64c5d975dbb3c4083e6699e2dd7bc91bc2d;hb=708d54d5e20748be17ff444499920a8fc31de8fd;hp=3c0dfab48791b392a2b64087e6ee568eb44e3641;hpb=1eaa43a8aa678f784fd0f4b587d45c1435285214;p=clitk.git diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx index 3c0dfab..0f8fa64 100644 --- a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx +++ b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx @@ -219,9 +219,6 @@ NormalizedCorrelationImageToImageMetric // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); -#if ITK_VERSION_MAJOR < 4 - this->m_Parameters = parameters; -#endif // MUST BE CALLED TO INITIATE PROCESSING this->GetValueMultiThreadedInitiate(); @@ -296,9 +293,6 @@ NormalizedCorrelationImageToImageMetric // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); -#if ITK_VERSION_MAJOR < 4 - this->m_Parameters = parameters; -#endif // MUST BE CALLED TO INITIATE PROCESSING this->GetValueMultiThreadedInitiate(); @@ -385,13 +379,8 @@ NormalizedCorrelationImageToImageMetric } // Jacobian should be evaluated at the unmapped (fixed image) point. -#if ITK_VERSION_MAJOR >= 4 TransformJacobianType jacobian; transform->ComputeJacobianWithRespectToParameters(fixedImagePoint, jacobian); -#else - const TransformJacobianType & jacobian = transform - ->GetJacobian( fixedImagePoint ); -#endif for(unsigned int par=0; parm_NumberOfParameters; par++) { RealType sumF = itk::NumericTraits< RealType >::Zero; @@ -431,9 +420,6 @@ NormalizedCorrelationImageToImageMetric // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); -#if ITK_VERSION_MAJOR < 4 - this->m_Parameters = parameters; -#endif //We need the sums and the value to be calculated first value=this->ComputeSums(parameters);