Print

Print


Commit in lcdd on MAIN
include/CellReadout2DSegmentation.hh+1-11.1 -> 1.2
src/CellReadout2DSegmentation.cc+10-91.2 -> 1.3
+11-10
2 modified files

lcdd/include
CellReadout2DSegmentation.hh 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- CellReadout2DSegmentation.hh	30 May 2013 00:04:12 -0000	1.1
+++ CellReadout2DSegmentation.hh	18 Jun 2013 20:00:10 -0000	1.2
@@ -30,7 +30,7 @@
 
     void setup(const G4Step*);
 
-    CellReadout2D::PositionXY localToReadoutCoordinates(G4ThreeVector&);
+    CellReadout2D::Position2D localToReadoutCoordinates(G4ThreeVector&);
 
 private:
 

lcdd/src
CellReadout2DSegmentation.cc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- CellReadout2DSegmentation.cc	10 Jun 2013 19:42:47 -0000	1.2
+++ CellReadout2DSegmentation.cc	18 Jun 2013 20:00:10 -0000	1.3
@@ -37,13 +37,14 @@
     G4ThreeVector localStepPos = ReadoutUtil::transformGlobalToLocal(aStep, globalStepPos);
 
     // Compute the X and Y readout coordinates from the local position.
-    CellReadout2D::PositionXY localXY;
+    CellReadout2D::Position2D localXY;
     localXY.first = localStepPos.x();
     localXY.second = localStepPos.y();
-    CellReadout2D::PositionXY xy = m_readout->localToReadoutCoordinates(localXY);
+    CellReadout2D::Position2D xy;
+    //= m_readout->localToReadoutCoordinates(localXY);
 
     // Get the cell for the position.
-    CellReadout2D::Cell cell = m_readout->getCell(xy);
+    CellReadout2D::CellId cell = m_readout->cellId(xy);
 
     // Set bin values.
     this->setBin(0, xy.first);
@@ -65,14 +66,14 @@
         std::cerr << "Volume is not a box" << std::endl;
         G4Exception("", "", FatalException, "CellReadout2D points to shape that is not a box.");
     }
-    m_readout->setReadoutDimensionX(box->GetXHalfLength() * 2);
-    m_readout->setReadoutDimensionY(box->GetYHalfLength() * 2);
+    //m_readout->setReadoutDimensionX(box->GetXHalfLength() * 2);
+    //m_readout->setReadoutDimensionY(box->GetYHalfLength() * 2);
 }
 
-CellReadout2D::PositionXY CellReadout2DSegmentation::localToReadoutCoordinates(G4ThreeVector& vec)
+CellReadout2D::Position2D CellReadout2DSegmentation::localToReadoutCoordinates(G4ThreeVector& vec)
 {
-    CellReadout2D::PositionXY xy;
-    xy.first = vec.x() + m_readout->getReadoutDimensionX() / 2.0;
-    xy.second = vec.y() + m_readout->getReadoutDimensionY() / 2.0;
+    CellReadout2D::Position2D xy;
+    //xy.first = vec.x() + m_readout->getReadoutDimensionX() / 2.0;
+    //xy.second = vec.y() + m_readout->getReadoutDimensionY() / 2.0;
     return xy;
 }
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1