diff options
Diffstat (limited to 'include/astra')
-rw-r--r-- | include/astra/FanFlatBeamLineKernelProjector2D.h | 8 | ||||
-rw-r--r-- | include/astra/FanFlatBeamStripKernelProjector2D.h | 8 | ||||
-rw-r--r-- | include/astra/ParallelBeamBlobKernelProjector2D.h | 8 | ||||
-rw-r--r-- | include/astra/ParallelBeamDistanceDrivenProjector2D.h | 8 | ||||
-rw-r--r-- | include/astra/ParallelBeamDistanceDrivenProjector2D.inl | 2 | ||||
-rw-r--r-- | include/astra/ParallelBeamLineKernelProjector2D.h | 8 | ||||
-rw-r--r-- | include/astra/ParallelBeamLinearKernelProjector2D.h | 8 | ||||
-rw-r--r-- | include/astra/ParallelBeamLinearKernelProjector2D.inl | 2 | ||||
-rw-r--r-- | include/astra/ParallelBeamStripKernelProjector2D.h | 8 | ||||
-rw-r--r-- | include/astra/Projector2D.h | 8 | ||||
-rw-r--r-- | include/astra/SparseMatrixProjector2D.h | 8 |
11 files changed, 1 insertions, 75 deletions
diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.h b/include/astra/FanFlatBeamLineKernelProjector2D.h index 1bfaf07..4492bdf 100644 --- a/include/astra/FanFlatBeamLineKernelProjector2D.h +++ b/include/astra/FanFlatBeamLineKernelProjector2D.h @@ -134,14 +134,6 @@ public: int _iMaxPixelCount, int& _iStoredPixelCount); - /** Create a list of detectors that are influenced by point [_iRow, _iCol]. - * - * @param _iRow row of the point - * @param _iCol column of the point - * @return list of SDetector2D structs - */ - virtual std::vector<SDetector2D> projectPoint(int _iRow, int _iCol); - /** Policy-based projection of all rays. This function will calculate each non-zero projection * weight and use this value for a task provided by the policy object. * diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.h b/include/astra/FanFlatBeamStripKernelProjector2D.h index a6a303c..4942f6c 100644 --- a/include/astra/FanFlatBeamStripKernelProjector2D.h +++ b/include/astra/FanFlatBeamStripKernelProjector2D.h @@ -132,14 +132,6 @@ public: int _iMaxPixelCount, int& _iStoredPixelCount); - /** Create a list of detectors that are influenced by point [_iRow, _iCol]. - * - * @param _iRow row of the point - * @param _iCol column of the point - * @return list of SDetector2D structs - */ - virtual std::vector<SDetector2D> projectPoint(int _iRow, int _iCol); - /** Policy-based projection of all rays. This function will calculate each non-zero projection * weight and use this value for a task provided by the policy object. * diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.h b/include/astra/ParallelBeamBlobKernelProjector2D.h index 46b0b52..ffae707 100644 --- a/include/astra/ParallelBeamBlobKernelProjector2D.h +++ b/include/astra/ParallelBeamBlobKernelProjector2D.h @@ -160,14 +160,6 @@ public: int _iMaxPixelCount, int& _iStoredPixelCount); - /** Create a list of detectors that are influenced by point [_iRow, _iCol]. - * - * @param _iRow row of the point - * @param _iCol column of the point - * @return list of SDetector2D structs - */ - virtual std::vector<SDetector2D> projectPoint(int _iRow, int _iCol); - /** Policy-based projection of all rays. This function will calculate each non-zero projection * weight and use this value for a task provided by the policy object. * diff --git a/include/astra/ParallelBeamDistanceDrivenProjector2D.h b/include/astra/ParallelBeamDistanceDrivenProjector2D.h index 67dd21b..6d1d633 100644 --- a/include/astra/ParallelBeamDistanceDrivenProjector2D.h +++ b/include/astra/ParallelBeamDistanceDrivenProjector2D.h @@ -138,14 +138,6 @@ public: int _iMaxPixelCount, int& _iStoredPixelCount); - /** Create a list of detectors that are influenced by point [_iRow, _iCol]. - * - * @param _iRow row of the point - * @param _iCol column of the point - * @return list of SDetector2D structs - */ - virtual std::vector<SDetector2D> projectPoint(int _iRow, int _iCol); - /** Policy-based projection of all rays. This function will calculate each non-zero projection * weight and use this value for a task provided by the policy object. diff --git a/include/astra/ParallelBeamDistanceDrivenProjector2D.inl b/include/astra/ParallelBeamDistanceDrivenProjector2D.inl index 6bf3b56..7b45ed1 100644 --- a/include/astra/ParallelBeamDistanceDrivenProjector2D.inl +++ b/include/astra/ParallelBeamDistanceDrivenProjector2D.inl @@ -81,8 +81,6 @@ void CParallelBeamDistanceDrivenProjector2D::projectBlock_internal(int _iProjFro const SParProjection * proj = &pVecProjectionGeometry->getProjectionVectors()[iAngle]; - float32 detSize = sqrt(proj->fDetUX * proj->fDetUX + proj->fDetUY * proj->fDetUY); - const bool vertical = fabs(proj->fRayX) < fabs(proj->fRayY); const float32 Ex = m_pVolumeGeometry->getWindowMinX() + pixelLengthX*0.5f; diff --git a/include/astra/ParallelBeamLineKernelProjector2D.h b/include/astra/ParallelBeamLineKernelProjector2D.h index f709e1d..4238919 100644 --- a/include/astra/ParallelBeamLineKernelProjector2D.h +++ b/include/astra/ParallelBeamLineKernelProjector2D.h @@ -132,14 +132,6 @@ public: int _iMaxPixelCount, int& _iStoredPixelCount); - /** Create a list of detectors that are influenced by point [_iRow, _iCol]. - * - * @param _iRow row of the point - * @param _iCol column of the point - * @return list of SDetector2D structs - */ - virtual std::vector<SDetector2D> projectPoint(int _iRow, int _iCol); - /** Policy-based projection of all rays. This function will calculate each non-zero projection * weight and use this value for a task provided by the policy object. * diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.h b/include/astra/ParallelBeamLinearKernelProjector2D.h index a09dcd1..67d940e 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.h +++ b/include/astra/ParallelBeamLinearKernelProjector2D.h @@ -135,14 +135,6 @@ public: int _iMaxPixelCount, int& _iStoredPixelCount); - /** Create a list of detectors that are influenced by point [_iRow, _iCol]. - * - * @param _iRow row of the point - * @param _iCol column of the point - * @return list of SDetector2D structs - */ - virtual std::vector<SDetector2D> projectPoint(int _iRow, int _iCol); - /** Policy-based projection of all rays. This function will calculate each non-zero projection * weight and use this value for a task provided by the policy object. diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.inl b/include/astra/ParallelBeamLinearKernelProjector2D.inl index 485eef6..10d4892 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.inl +++ b/include/astra/ParallelBeamLinearKernelProjector2D.inl @@ -156,7 +156,7 @@ void CParallelBeamLinearKernelProjector2D::projectBlock_internal(int _iProjFrom, float32 detSize = sqrt(proj->fDetUX * proj->fDetUX + proj->fDetUY * proj->fDetUY); - bool vertical = fabs(proj->fRayX) < fabs(proj->fRayY); + const bool vertical = fabs(proj->fRayX) < fabs(proj->fRayY); if (vertical) { RxOverRy = proj->fRayX/proj->fRayY; lengthPerRow = detSize * m_pVolumeGeometry->getPixelLengthX() * sqrt(proj->fRayY*proj->fRayY + proj->fRayX*proj->fRayX) / abs(proj->fRayY); diff --git a/include/astra/ParallelBeamStripKernelProjector2D.h b/include/astra/ParallelBeamStripKernelProjector2D.h index 153a454..597f8dc 100644 --- a/include/astra/ParallelBeamStripKernelProjector2D.h +++ b/include/astra/ParallelBeamStripKernelProjector2D.h @@ -133,14 +133,6 @@ public: int _iMaxPixelCount, int& _iStoredPixelCount); - /** Create a list of detectors that are influenced by point [_iRow, _iCol]. - * - * @param _iRow row of the point - * @param _iCol column of the point - * @return list of SDetector2D structs - */ - virtual std::vector<SDetector2D> projectPoint(int _iRow, int _iCol); - /** Policy-based projection of all rays. This function will calculate each non-zero projection * weight and use this value for a task provided by the policy object. * diff --git a/include/astra/Projector2D.h b/include/astra/Projector2D.h index 8e0b7a8..9d9130f 100644 --- a/include/astra/Projector2D.h +++ b/include/astra/Projector2D.h @@ -149,14 +149,6 @@ public: SPixelWeight* _pfWeightedPixels, int* _piRayStoredPixelCount); - /** Create a list of detectors that are influenced by point [_iRow, _iCol]. - * - * @param _iRow row of the point - * @param _iCol column of the point - * @return list of SDetector2D structs - */ - virtual std::vector<SDetector2D> projectPoint(int _iRow, int _iCol) = 0; - /** Returns the number of weights required for storage of all weights of one projection ray. * * @param _iProjectionIndex Index of the projection (zero-based). diff --git a/include/astra/SparseMatrixProjector2D.h b/include/astra/SparseMatrixProjector2D.h index db8c4e2..1fc44c5 100644 --- a/include/astra/SparseMatrixProjector2D.h +++ b/include/astra/SparseMatrixProjector2D.h @@ -133,14 +133,6 @@ public: int _iMaxPixelCount, int& _iStoredPixelCount); - /** Create a list of detectors that are influenced by point [_iRow, _iCol]. - * - * @param _iRow row of the point - * @param _iCol column of the point - * @return list of SDetector2D structs - */ - virtual std::vector<SDetector2D> projectPoint(int _iRow, int _iCol); - /** Policy-based projection of all rays. This function will calculate each non-zero projection * weight and use this value for a task provided by the policy object. * |