diff --git a/.gitignore b/.gitignore index 4bebd19..9676920 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /.idea/ /build/ /output/ +/notebooks/.ipynb_checkpoints !gradle-wrapper.jar diff --git a/build.gradle b/build.gradle index 9b36dbc..d64e25d 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,6 @@ repositories { dependencies { 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 compile group: 'org.apache.commons', name: 'commons-rng-simple', version: '1.1' @@ -28,12 +27,3 @@ compileKotlin { 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' -//} - diff --git a/notebooks/images/Cross-sections.png b/notebooks/images/Cross-sections.png new file mode 100644 index 0000000..637123d Binary files /dev/null and b/notebooks/images/Cross-sections.png differ diff --git a/notebooks/images/spectra.pdf b/notebooks/images/spectra.pdf new file mode 100644 index 0000000..a5fa6f6 Binary files /dev/null and b/notebooks/images/spectra.pdf differ diff --git a/notebooks/images/spectra.svg b/notebooks/images/spectra.svg new file mode 100644 index 0000000..4cc8989 --- /dev/null +++ b/notebooks/images/spectra.svg @@ -0,0 +1 @@ +0100020003000050010001500200025003000E = 12 keVE = 14 keVE = 16 keVE = 18 keVε (eV)N \ No newline at end of file diff --git a/src/main/kotlin/ru/inr/mass/trapping/Scatter.kt b/src/main/kotlin/ru/inr/mass/trapping/Scatter.kt index bddd60f..a6e4bed 100644 --- a/src/main/kotlin/ru/inr/mass/trapping/Scatter.kt +++ b/src/main/kotlin/ru/inr/mass/trapping/Scatter.kt @@ -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) * 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 { diff --git a/src/main/kotlin/ru/inr/mass/trapping/Simulator.kt b/src/main/kotlin/ru/inr/mass/trapping/Simulator.kt index f248255..350242f 100644 --- a/src/main/kotlin/ru/inr/mass/trapping/Simulator.kt +++ b/src/main/kotlin/ru/inr/mass/trapping/Simulator.kt @@ -15,7 +15,7 @@ import ru.inr.mass.trapping.Scatter.counter import ru.inr.mass.trapping.Scatter.debug /** - * @author Darksnake + * @author Alexander Nozik * @property magneticField Longitudal magnetic field distribution * @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 }