This commit is contained in:
Alexander Nozik 2020-10-18 19:39:40 +03:00
parent 981cb5f821
commit 9795e1e3df
7 changed files with 5 additions and 13 deletions

1
.gitignore vendored
View File

@ -2,4 +2,5 @@
/.idea/ /.idea/
/build/ /build/
/output/ /output/
/notebooks/.ipynb_checkpoints
!gradle-wrapper.jar !gradle-wrapper.jar

View File

@ -16,7 +16,6 @@ repositories {
dependencies { dependencies {
compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
// https://mvnrepository.com/artifact/org.apache.commons/commons-rng-simple // https://mvnrepository.com/artifact/org.apache.commons/commons-rng-simple
compile group: 'org.apache.commons', name: 'commons-rng-simple', version: '1.1' compile group: 'org.apache.commons', name: 'commons-rng-simple', version: '1.1'
@ -28,12 +27,3 @@ compileKotlin {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
//task runTrap(type: JavaExec) {
// classpath = sourceSets.main.runtimeClasspath
//
// main = mainClassName
//
// // arguments to pass to the application
// args 'D:\\Work\\Numass\\trapping\\trap.out'
//}

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 38 KiB

View File

@ -8,7 +8,7 @@ import org.apache.commons.math3.util.Pair
* *
* The initial code was written by Ferenc Glueck and then rewritten by [Sebastian Voecking](mailto:seb.voeck@uni-muenster.de) * The initial code was written by Ferenc Glueck and then rewritten by [Sebastian Voecking](mailto:seb.voeck@uni-muenster.de)
* into C++. To reference the code, don't forget to also include [kasiopea](http://stacks.iop.org/1367-2630/19/i=5/a=053012). * into C++. To reference the code, don't forget to also include [kasiopea](http://stacks.iop.org/1367-2630/19/i=5/a=053012).
* @author Darksnake * @author Alexander Nozik
*/ */
object Scatter { object Scatter {

View File

@ -15,7 +15,7 @@ import ru.inr.mass.trapping.Scatter.counter
import ru.inr.mass.trapping.Scatter.debug import ru.inr.mass.trapping.Scatter.debug
/** /**
* @author Darksnake * @author Alexander Nozik
* @property magneticField Longitudal magnetic field distribution * @property magneticField Longitudal magnetic field distribution
* @property gasDensity gas density in 1/m^3 * @property gasDensity gas density in 1/m^3
*/ */
@ -420,7 +420,7 @@ class Simulator(
} }
} }
assert(!java.lang.Double.isNaN(theta)) require(!theta.isNaN())
return theta return theta
} }