Author: [log in to unmask]
Date: Wed Jan 6 10:13:08 2016
New Revision: 4093
Log:
create new package to reduce cluttering.
Added:
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/AlignmentUtils.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/AlignmentUtils.java
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/GlobalParameter.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/GlobalParameter.java
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/GlobalParameters.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/GlobalParameters.java
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/MPAlignmentInputCalculator.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/MPAlignmentInputCalculator.java
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/ModuleMPAlignmentInput.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ModuleMPAlignmentInput.java
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/RunMPAlignment.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/RunMPAlignment.java
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/StripMPAlignmentInput.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/StripMPAlignmentInput.java
Removed:
java/trunk/users/src/main/java/org/hps/users/phansson/AlignmentUtils.java
java/trunk/users/src/main/java/org/hps/users/phansson/GlobalParameter.java
java/trunk/users/src/main/java/org/hps/users/phansson/GlobalParameters.java
java/trunk/users/src/main/java/org/hps/users/phansson/MPAlignmentInputCalculator.java
java/trunk/users/src/main/java/org/hps/users/phansson/ModuleMPAlignmentInput.java
java/trunk/users/src/main/java/org/hps/users/phansson/RunMPAlignment.java
java/trunk/users/src/main/java/org/hps/users/phansson/StripMPAlignmentInput.java
Modified:
java/trunk/users/src/main/java/org/hps/users/phansson/WTrack.java
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/WTrack.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/WTrack.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/WTrack.java Wed Jan 6 10:13:08 2016
@@ -12,8 +12,13 @@
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
/**
- *
- * @author phansson
+ * Track representation based on paper
+ * Paul Avery, CBX 98-39, June 9, 1998
+ *
+ * Used primarily for the algorithm to intersect a helix with a generic plane in space.
+ *
+ * @author phansson <[log in to unmask]>
+ *
*/
public class WTrack {
@@ -79,10 +84,6 @@
public double a() {
return _a;
- }
-
- private int getCharge() {
- return (int) Math.signum(_htf.R());
}
public Hep3Vector getP0() {
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/AlignmentUtils.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/AlignmentUtils.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/AlignmentUtils.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/AlignmentUtils.java Wed Jan 6 10:13:08 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.alignment;
import hep.physics.matrix.BasicMatrix;
import hep.physics.vec.BasicHep3Matrix;
@@ -1053,7 +1053,7 @@
}
- double sign(double val) {
+ public double sign(double val) {
return Math.signum(val);
}
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/GlobalParameter.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/GlobalParameter.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/GlobalParameter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/GlobalParameter.java Wed Jan 6 10:13:08 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.alignment;
import hep.physics.matrix.BasicMatrix;
import hep.physics.vec.Hep3Vector;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/GlobalParameters.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/GlobalParameters.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/GlobalParameters.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/GlobalParameters.java Wed Jan 6 10:13:08 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.alignment;
import java.util.ArrayList;
import java.util.List;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/MPAlignmentInputCalculator.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/MPAlignmentInputCalculator.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/MPAlignmentInputCalculator.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/MPAlignmentInputCalculator.java Wed Jan 6 10:13:08 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.alignment;
import hep.aida.IAnalysisFactory;
import hep.physics.matrix.BasicMatrix;
@@ -19,6 +19,7 @@
import org.hps.recon.tracking.TrackerHitUtils;
import org.hps.users.mgraham.alignment.RunAlignment;
+import org.hps.users.phansson.ResLimit;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.util.aida.AIDA;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/ModuleMPAlignmentInput.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ModuleMPAlignmentInput.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ModuleMPAlignmentInput.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/ModuleMPAlignmentInput.java Wed Jan 6 10:13:08 2016
@@ -1,4 +1,4 @@
-package org.hps.users.phansson;
+package org.hps.users.phansson.alignment;
import hep.aida.ICloud1D;
import hep.aida.IDataPointSet;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/RunMPAlignment.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/RunMPAlignment.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/RunMPAlignment.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/RunMPAlignment.java Wed Jan 6 10:13:08 2016
@@ -1,4 +1,4 @@
-package org.hps.users.phansson;
+package org.hps.users.phansson.alignment;
import hep.physics.vec.BasicHep3Vector;
@@ -10,6 +10,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.users.phansson.TrigRateAna;
+import org.hps.users.phansson.TrigRateDriver;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/StripMPAlignmentInput.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/StripMPAlignmentInput.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/StripMPAlignmentInput.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/StripMPAlignmentInput.java Wed Jan 6 10:13:08 2016
@@ -1,4 +1,4 @@
-package org.hps.users.phansson;
+package org.hps.users.phansson.alignment;
import hep.aida.ICloud1D;
import hep.aida.IDataPointSet;
