From 79fefd5962516a9bf8f53f33558b64dd8e16e236 Mon Sep 17 00:00:00 2001
From: Artur Glavic <artur.glavic@psi.ch>
Date: Tue, 4 Jun 2019 22:36:02 +0200
Subject: [PATCH] Run again with previous WW and forced collisions

---
 e2-estia.i                 | 22 +++++++++++-----------
 sources/e2_2m_mod.i        |  2 +-
 weight_windows/current.wwg |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/e2-estia.i b/e2-estia.i
index f489503..8ccc8d2 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -160,15 +160,15 @@ ext:n 0 276r $ in monolith
       0 16r 0.25v3 6r $ BWC
       0 63r
 c forced collisions in neutron guides
-c fcl:n 0 276r $ in monolith
-c       0 309r $ ess outside
-c       0 -0.05 -0.1 4r $ NBOA
-c       0 23r -0.1 $ BBG
-c       0 13r -0.25 6r $ NFGA
-c       0 170r -1 $ S1 glass
-c       0 10r -1 -1 $ S2 glass + carrier
-c       0 22r -1 $ S1 carrier (universe)
-c       0 8r
+fcl:n 0 276r $ in monolith
+      0 309r $ ess outside
+      0 -0.05 -0.1 4r $ NBOA
+      0 23r -0.1 $ BBG
+      0 13r -0.25 6r $ NFGA
+      0 170r -1 $ S1 glass
+      0 10r -1 -1 $ S2 glass + carrier
+      0 22r -1 $ S1 carrier (universe)
+      0 8r
 c exponential transform reference vectors: origin, selene 1, sample
 vect v1 0 0 0 v2 1000 -1394 -6.5 v3 2048 -2856 -30
 c 
@@ -177,7 +177,7 @@ c -------------------------------------------------------
 c --------------- PHYSICS CARDS --------------------------
 c -------------------------------------------------------
 c dbcn 375642321 j j j j j j j j j j j 15291711
-nps 1e7
+nps 1e9
 c histp
 mode            n p h / 
                 d $ deuteron
@@ -221,7 +221,7 @@ c read file=sources/mcstas_source_mf.i echo
 c read file=sources/mcstas_gammas.i echo
 c read file=sources/mcstas_gammas_2.i echo
 c read file=sources/mcstas_source_shutter.i echo
-prdmp 1e7 -10 1 2 1e5
+prdmp 1e8 -10 1 2 1e6
 print 30 32 40 $ 120 128 150 160 161 162  
 c ++++++++++++++++++++++ END ++++++++++++++++++++++++++++
 
diff --git a/sources/e2_2m_mod.i b/sources/e2_2m_mod.i
index 62f5aac..10f0310 100644
--- a/sources/e2_2m_mod.i
+++ b/sources/e2_2m_mod.i
@@ -4,7 +4,7 @@ c cut all photons that can't produce neutrons
 cut:p 1e+08 1.667
 c but adapted to model geometry and actual size of Estia beam extraction
 c make sure to supply the correct WWINP file
-c WWP:n   j j 2 j -1 j 1.0e-3 1j 1e17 1j $ weights are lower then from proton
+WWP:n  j j 4 j -1 j 1.0 1j 5e17 1j
 c the source definition with neutrons/s
 sdef  dir=d1 erg=fdir d2 x=199.5 y=d23 z=d24  vec=1 0 0 tr=101
         par=n ara=165.0 wgt=6.14727e+13
diff --git a/weight_windows/current.wwg b/weight_windows/current.wwg
index cd4eae8..6b93c04 120000
--- a/weight_windows/current.wwg
+++ b/weight_windows/current.wwg
@@ -1 +1 @@
-e2-estia_newmono_v02-78.wwg
\ No newline at end of file
+e2-estia_newmono_v02-19-gc52d690.wwg
\ No newline at end of file