Print

Print


Commit in lcdd on MAIN
src/lcdd/detectors/BasicTrackerHitProcessor.cc+2-21.1 -> 1.2
                  /ScoringTrackerHitProcessor.cc+2-21.2 -> 1.3
                  /StepCombiningTrackerHitProcessor.cc+2-21.2 -> 1.3
src/lcdd/hits/TrackerHit.cc+4-41.5 -> 1.6
include/lcdd/hits/TrackerHit.hh+3-31.6 -> 1.7
+13-13
5 modified files
method rename

lcdd/src/lcdd/detectors
BasicTrackerHitProcessor.cc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- BasicTrackerHitProcessor.cc	11 Jul 2013 22:39:17 -0000	1.1
+++ BasicTrackerHitProcessor.cc	2 Oct 2013 02:05:22 -0000	1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/BasicTrackerHitProcessor.cc,v 1.1 2013/07/11 22:39:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/BasicTrackerHitProcessor.cc,v 1.2 2013/10/02 02:05:22 jeremy Exp $
 
 // LCDD
 #include "lcdd/detectors/BasicTrackerHitProcessor.hh"
@@ -89,7 +89,7 @@
     // Set the hit information from above.
     hit->setTrackID(trackId);
     hit->setEdep(edep);
-    hit->setPos(mid);
+    hit->setPosition(mid);
     hit->setMomentum(momentum);
     hit->setTdep(time);
     hit->setId(id64.getId0());

lcdd/src/lcdd/detectors
ScoringTrackerHitProcessor.cc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- ScoringTrackerHitProcessor.cc	22 Aug 2013 22:32:17 -0000	1.2
+++ ScoringTrackerHitProcessor.cc	2 Oct 2013 02:05:22 -0000	1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/ScoringTrackerHitProcessor.cc,v 1.2 2013/08/22 22:32:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/ScoringTrackerHitProcessor.cc,v 1.3 2013/10/02 02:05:22 jeremy Exp $
 
 // LCDD
 #include "lcdd/detectors/ScoringTrackerHitProcessor.hh"
@@ -66,7 +66,7 @@
         // Set the hit information.
         newHit->setTrackID(trkID);
         newHit->setEdep(e);
-        newHit->setPos(prePosition);
+        newHit->setPosition(prePosition);
         newHit->setMomentum(meanMomentum);
         newHit->setTdep(tdep);
         newHit->setId(id64.getId0());

lcdd/src/lcdd/detectors
StepCombiningTrackerHitProcessor.cc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- StepCombiningTrackerHitProcessor.cc	17 Sep 2013 00:25:01 -0000	1.2
+++ StepCombiningTrackerHitProcessor.cc	2 Oct 2013 02:05:22 -0000	1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/StepCombiningTrackerHitProcessor.cc,v 1.2 2013/09/17 00:25:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/StepCombiningTrackerHitProcessor.cc,v 1.3 2013/10/02 02:05:22 jeremy Exp $
 
 // LCDD
 #include "lcdd/detectors/StepCombiningTrackerHitProcessor.hh"
@@ -151,7 +151,7 @@
     TrackerHit* hit = new TrackerHit();
     hit->setTdep(_minTime);
     hit->setEdep(_edepTotal);
-    hit->setPos(midpoint);
+    hit->setPosition(midpoint);
     hit->setMomentum(meanMomentum);
     hit->setTrackID(_currentTrackID);
     hit->setLength(pathlength);

lcdd/src/lcdd/hits
TrackerHit.cc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- TrackerHit.cc	17 Sep 2013 00:30:45 -0000	1.5
+++ TrackerHit.cc	2 Oct 2013 02:05:22 -0000	1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackerHit.cc,v 1.5 2013/09/17 00:30:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackerHit.cc,v 1.6 2013/10/02 02:05:22 jeremy Exp $
 
 // LCDD
 #include "lcdd/hits/TrackerHit.hh"
@@ -50,7 +50,7 @@
 
 std::ostream& operator<<(std::ostream &os, const TrackerHit& hit)
 {
-    std::cout << hit.getTrackID() << " " << hit.getPos() << " " << G4BestUnit(hit.getEdep(), "Energy") << " " << hit.getMomentum() << " " << G4BestUnit(hit.getLength(), "Length") << " " << G4BestUnit(hit.getTdep(), "Time") << " " << hit.getPDG() << " " << std::endl;
+    std::cout << hit.getTrackID() << " " << hit.getPosition() << " " << G4BestUnit(hit.getEdep(), "Energy") << " " << hit.getMomentum() << " " << G4BestUnit(hit.getLength(), "Length") << " " << G4BestUnit(hit.getTdep(), "Time") << " " << hit.getPDG() << " " << std::endl;
     return os;
 }
 
@@ -64,7 +64,7 @@
     _edep = edep;
 }
 
-void TrackerHit::setPos(const G4ThreeVector& posXYZ)
+void TrackerHit::setPosition(const G4ThreeVector& posXYZ)
 {
     _pos = posXYZ;
 }
@@ -99,7 +99,7 @@
     return _edep;
 }
 
-G4ThreeVector TrackerHit::getPos() const
+G4ThreeVector TrackerHit::getPosition() const
 {
     return _pos;
 }

lcdd/include/lcdd/hits
TrackerHit.hh 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- TrackerHit.hh	17 Sep 2013 00:30:02 -0000	1.6
+++ TrackerHit.hh	2 Oct 2013 02:05:22 -0000	1.7
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackerHit.hh,v 1.6 2013/09/17 00:30:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackerHit.hh,v 1.7 2013/10/02 02:05:22 jeremy Exp $
 
 #ifndef LCDD_HITS_TRACKERHIT_HH
 #define LCDD_HITS_TRACKERHIT_HH 1
@@ -75,7 +75,7 @@
      * Set the global position.
      * @param[in] posXYZ The position in global coordinates (mm).
      */
-    void setPos(const G4ThreeVector& posXYZ);
+    void setPosition(const G4ThreeVector& posXYZ);
 
     /**
      * Set the momentum.
@@ -117,7 +117,7 @@
      * Set the global position.
      * @return The global position.
      */
-    G4ThreeVector getPos() const;
+    G4ThreeVector getPosition() const;
 
     /**
      * Get the momentum.
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