NPM/trapping
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Alexander Nozik 2016-06-15 15:27:34 +03:00
parent 5b6f642c56
commit a5c0bf0b97
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/inr/numass/trapping/Simulator.java
View File

@ -149,7 +149,7 @@ public class Simulator {
double deltaZ = deltaL * cos(pos.theta); // direction already included in cos(theta)
double z0 = pos.z;
pos.addZ(deltaZ);
pos.l += abs(pos.z - z0) / cos(pos.theta);
pos.l += deltaL;
// //if we are crossing source boundary, check for end condition
// while (abs(deltaZ + pos.z) > SOURCE_LENGTH / 2d && !pos.isFinished()) {

4
src/main/java/inr/numass/trapping/Trapping.java
View File

@ -15,8 +15,8 @@ public class Trapping {
Instant startTime = Instant.now();
System.out.printf("Starting at %s%n%n", startTime.toString());
new SimulationManager()
.withParameters(0.6, 3.7, 4.84, 18000d, 4000)
.withOutputFile("D:\\Work\\Numass\\trapping\\trap 18, pinch 100A.out")
.withParameters(0.6, 3.7, 4.84, 14000d, 4000)
.withOutputFile("D:\\Work\\Numass\\trapping\\trap 14, pinch 100A.out")
// .withFieldMap(z, b)
// .withDensity(5e20)
.simulateAll((int) 1e6);