work in progress on new cell segmentation interface; change from signed to unsigned coordinate system in CellReadout2D; implement CelReadout2DSegmentation::getGlobalHitPosition; other minor changes and refactorings

+ /** + * Set the current X dimension. + * @param[in] dimensionX The dimension in X. + */ + void setDimensionX(double dimensionX); + + /** + * Set the current Y dimension. + * @param[in] dimensionY The dimension in Y. + */ + + void setDimensionY(double dimensionY); + + /** + * Get the current dimension in X. + * @return The dimension in X. + */ + double getDimensionX(); + + /** + * Get the current dimension in Y. + * @return The dimension in Y. + */ + double getDimensionY(); +

+ CellReadout::Position2D localToReadoutCoordinates(G4ThreeVector& pos); + + /** + * Convert unsigned readout coordinates back to local. + * @return The local coordinates converted from readout XY position. + */ + G4ThreeVector readoutToLocalCoordinates(CellReadout::Position2D position);

+ +void CellReadout2D::setDimensionX(double dimensionX) +{ + _dimensionX = dimensionX; +} + +void CellReadout2D::setDimensionY(double dimensionY) +{ + _dimensionY = dimensionY; +} + +double CellReadout2D::getDimensionX() +{ + return _dimensionX; +} + +double CellReadout2D::getDimensionY() +{ + return _dimensionY; +} +

lcdd/src/lcdd/detectors

CellReadout2DSegmentation.cc 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- CellReadout2DSegmentation.cc	11 Jul 2013 20:41:54 -0000	1.4
+++ CellReadout2DSegmentation.cc	6 Sep 2013 02:17:48 -0000	1.5
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CellReadout2DSegmentation.cc,v 1.4 2013/07/11 20:41:54 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CellReadout2DSegmentation.cc,v 1.5 2013/09/06 02:17:48 jeremy Exp $

 
 // LCDD
 #include "lcdd/detectors/CellReadout2DSegmentation.hh"

@@ -25,33 +25,106 @@

 
 G4ThreeVector CellReadout2DSegmentation::getGlobalHitPosition(const G4Step* aStep)
 {

-    // TODO: implement me

+    std::cout << "CellReadout2DSegmentation::getGlobalHitPosition" << std::endl;
+
+    // Setup the readout with step dependent information.
+    setup(aStep);
+
+    // Compute the mid-point of the global step.
+    G4ThreeVector globalStepPosition = ReadoutUtil::computeMidPos(aStep);
+
+    // DEBUG
+    std::cout << "globalStepPosition: " << globalStepPosition.x() << " " << globalStepPosition.y() << " " << globalStepPosition.z() << std::endl;
+
+    // Compute the local step position.
+    G4ThreeVector localStepPosition = ReadoutUtil::transformGlobalToLocal(aStep, globalStepPosition);
+
+    // DEBUG
+    std::cout << "localStepPosition: " << localStepPosition.x() << " " << localStepPosition.y() << " " << localStepPosition.z() << std::endl;
+
+    // Convert into readout coordinates.
+    CellReadout::Position2D readoutStepPosition = localToReadoutCoordinates(localStepPosition);
+
+    // DEBUG
+    std::cout << "readoutStepPosition: " << readoutStepPosition.x << " " << readoutStepPosition.y << std::endl;
+
+    // Compute the cell indices from the position.
+    CellReadout::CellId cell = _readout->cellId(readoutStepPosition);
+
+    // DEBUG
+    std::cout << "cell: " << cell[0] << " " << cell[1] << std::endl;
+
+    // Get the cell's readout position from the cell ID.
+    CellReadout::Position2D cellPosition = _readout->position(cell);
+
+    // DEBUG
+    std::cout << "cellPosition: " << cellPosition.x << " " << cellPosition.y << std::endl;
+
+    // Convert from readout back to localcoordinates.
+    G4ThreeVector localCellPosition = readoutToLocalCoordinates(cellPosition);
+
+    // DEBUG
+    std::cout << "localCellPosition: "<< localCellPosition.x() << " " << localCellPosition.y() << " " << localCellPosition.z() << std::endl;
+
+    // Finally convert from the local coordinates into global.
+    G4ThreeVector globalCellPosition = ReadoutUtil::transformLocalToGlobal(aStep, localCellPosition);
+
+    // DEBUG
+    std::cout << "globalCellPosition: "
+            << globalCellPosition.x() << " "
+            << globalCellPosition.y() << " "
+            << globalCellPosition.z() << std::endl;
+
+    std::cout << std::endl;
+
+    return globalCellPosition;

 }
 
 void CellReadout2DSegmentation::setBins(const G4Step* aStep)
 {

+    // DEBUG
+    std::cout << "CellReadout2DSegmentation::setBins" << std::endl;
+
+    // Setup the readout with step dependent information.
+    setup(aStep);
+
+    // DEBUG
+    G4ThreeVector prePosition = aStep->GetPreStepPoint()->GetPosition();
+    std::setprecision(10);
+    std::cout << "pre-step pos: " << prePosition.x() << " " << prePosition.y() << " " << prePosition.z() << std::endl;
+

     // Set state from current step.
     setup(aStep);
 
     // Compute the global mid-point of the step.
     G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos(aStep);

+    // DEBUG
+    std::cout << "globalStepPos: " << globalStepPos.x() << " " << globalStepPos.y() << " " << globalStepPos.z() << std::endl;
+

     // Compute the local step position from the global mid-point.
     G4ThreeVector localStepPos = ReadoutUtil::transformGlobalToLocal(aStep, globalStepPos);

+    // DEBUG
+    std::cout << "localStepPos: " << localStepPos.x() << " " << localStepPos.y() << " " << localStepPos.z() << std::endl;
+

     // Compute the X and Y readout coordinates from the local position.

-    CellReadout2D::Position2D localXY;
-    localXY.first = localStepPos.x();
-    localXY.second = localStepPos.y();
-    CellReadout2D::Position2D xy;
-    //= m_readout->localToReadoutCoordinates(localXY);

+    CellReadout::Position2D cellPosition = localToReadoutCoordinates(localStepPos);
+
+    // DEBUG
+    std::cout << "cell pos XY: " << cellPosition.x << " " << cellPosition.y << std::endl;

 
     // Get the cell for the position.

-    CellReadout2D::CellId cell = _readout->cellId(xy);

+    CellReadout::CellId cell = _readout->cellId(cellPosition);
+
+    // DEBUG
+    std::cout << "cell ID: " << cell[0] << " " << cell[1] << std::endl;

-    // Set bin values.
-    this->setBin(0, xy.first);
-    this->setBin(1, xy.second);

+    // Set the segmentation's bin values.
+    this->setBin(0, cellPosition.x);
+    this->setBin(1, cellPosition.y);
+
+    std::cout << std::endl;

 }
 
 void CellReadout2DSegmentation::setBinNames()

@@ -65,18 +138,28 @@

     // Set dimensions from box volume.
     G4VSolid* solid = ReadoutUtil::getSolidFromStepPoint(aStep->GetPreStepPoint());
     G4Box* box = dynamic_cast<G4Box*>(solid);

-    if (0 == box) {

+    if (box == 0) {

         std::cerr << "Volume is not a box" << std::endl;

-        G4Exception("", "", FatalException, "CellReadout2D points to shape that is not a box.");

+        G4Exception("", "", FatalException, "CellReadout2D points to a shape that is not a G4Box.");

-    //m_readout->setReadoutDimensionX(box->GetXHalfLength() * 2);
-    //m_readout->setReadoutDimensionY(box->GetYHalfLength() * 2);

+    _readout->setDimensionX(box->GetXHalfLength() * 2);
+    _readout->setDimensionY(box->GetYHalfLength() * 2);
+
+    // DEBUG
+    std::cout << "set readout dimensions XY: " << _readout->getDimensionX() << " " << _readout->getDimensionY() << std::endl;
+}
+
+CellReadout::Position2D CellReadout2DSegmentation::localToReadoutCoordinates(G4ThreeVector& vec)
+{
+    CellReadout::Position2D position;
+    position.x = vec.x() + _readout->getDimensionX() / 2.;
+    position.y = vec.y() + _readout->getDimensionY() / 2.;
+    return position;

-CellReadout2D::Position2D CellReadout2DSegmentation::localToReadoutCoordinates(G4ThreeVector& vec)

+G4ThreeVector CellReadout2DSegmentation::readoutToLocalCoordinates(CellReadout::Position2D position)

-    CellReadout2D::Position2D xy;
-    //xy.first = vec.x() + m_readout->getReadoutDimensionX() / 2.0;
-    //xy.second = vec.y() + m_readout->getReadoutDimensionY() / 2.0;
-    return xy;

+    double x = position.x - _readout->getDimensionX() / 2.;
+    double y = position.y - _readout->getDimensionY() / 2.;
+    return G4ThreeVector(x, y, 0);

Commit in `lcdd` on MAIN
`include/lcdd/detectors/CellReadout.hh`	+12	-7	1.7 -> 1.8
`/CellReadout2D.hh`	+29	-2	1.6 -> 1.7
`/CellReadout2DSegmentation.hh`	+9	-3	1.7 -> 1.8
`src/lcdd/detectors/CellReadout.cc`	+5	-5	1.2 -> 1.3
`/CellReadout2D.cc`	+35	-16	1.2 -> 1.3
`/CellReadout2DSegmentation.cc`	+103	-20	1.4 -> 1.5
	+193	-53