diff --git a/sammy/src/acs/macs0.f90 b/sammy/src/acs/macs0.f90
index 889a18bbe56989efa9e334a008137fbbd401fab9..4349219efe68500e0eb2908dd375d9e985ca230b 100644
--- a/sammy/src/acs/macs0.f90
+++ b/sammy/src/acs/macs0.f90
@@ -54,8 +54,8 @@ module acs_m
use exploc_urr_common_m
use z00001_common_m
use AllocateFunctions_m
- use acs1
- use acs5
+ use acs1_m
+ use acs5_m
use SammyFlowControl_M, only : fitOption, Where_To_Next, urr_calc
IMPLICIT DOUBLE PRECISION (a-h,o-z)
real(kind=8),allocatable,dimension(:)::A_Idm
diff --git a/sammy/src/acs/macs1.f90 b/sammy/src/acs/macs1.f90
index 0928a8681ecf294d99aaa5dff754e15f0f0b373e..7d06587aa025a92de1c224d2c7793e74893d9215 100644
--- a/sammy/src/acs/macs1.f90
+++ b/sammy/src/acs/macs1.f90
@@ -1,5 +1,5 @@
!
-module acs1
+module acs1_m
contains
!
! ______________________________________________________________________
@@ -85,10 +85,10 @@ module acs1
use fixedr_m
use exploc_urr_common_m
use constn_common_m
- use acs2
- use acs3
- use acs4
- use acs6
+ use acs2_m
+ use acs3_m
+ use acs4_m
+ use acs6_m
use fit1
IMPLICIT DOUBLE PRECISION (a-h,o-z)
!
@@ -171,8 +171,8 @@ module acs1
use exploc_urr_common_m
use lbro_common_m
use constn_common_m
- use acs2
- use acs3
+ use acs2_m
+ use acs3_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
!
DIMENSION Eeeset(*), Theory(*), Theorl(Numelv,*), &
@@ -238,4 +238,4 @@ module acs1
!
RETURN
END
-end module acs1
\ No newline at end of file
+end module acs1_m
\ No newline at end of file
diff --git a/sammy/src/acs/macs2.f90 b/sammy/src/acs/macs2.f90
index 1f0a5430ed3f4aab71e2b2640115eca953271378..64b5346dfdc2e06d40d13cf4b35dd8585112852e 100644
--- a/sammy/src/acs/macs2.f90
+++ b/sammy/src/acs/macs2.f90
@@ -1,5 +1,5 @@
!
-module acs2
+module acs2_m
contains
!
! ______________________________________________________________________
@@ -199,9 +199,9 @@ module acs2
WRITE (6,10300) (Engurr(K),K=1,Numurr)
10300 FORMAT (1P5G14.6)
WRITE (21,10400)
-10400 FORMAT ('STOP in Find_Urr in acs/macs2.f')
+10400 FORMAT ('STOP in Find_Urr in acs/macs2_m.f')
WRITE (21,10100)
WRITE (6,10100)
- STOP '[STOP in Find_Urr in acs/macs2.f]'
+ STOP '[STOP in Find_Urr in acs/macs2_m.f]'
END
-end module acs2
+end module acs2_m
diff --git a/sammy/src/acs/macs3.f90 b/sammy/src/acs/macs3.f90
index b4990d32dc41ba9ff74a307922c536fce22566fc..0c3554c9f90309aab352db4b92617fb8c489c2d8 100644
--- a/sammy/src/acs/macs3.f90
+++ b/sammy/src/acs/macs3.f90
@@ -1,5 +1,5 @@
!
-module acs3
+module acs3_m
contains
!
! ______________________________________________________________________
@@ -19,9 +19,9 @@ module acs3
use z00001_common_m
use constn_common_m
use Endepx_common_m
- use acs2
- use acs4
- use acs6
+ use acs2_m
+ use acs4_m
+ use acs6_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
CHARACTER*4 Type(5)
CHARACTER*1 Pm
@@ -314,7 +314,7 @@ module acs3
! Wav COMPUTES THE WIDTH FLUCTUATION AVERAGE AND ITS DERIVATIVES
!
use ifwrit_m
- use acs7
+ use acs7_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
CHARACTER*4 Type(5)
DIMENSION Aelast(7,*), Ainela(7,*)
@@ -457,6 +457,6 @@ module acs3
10500 FORMAT ('Bi=', 1P5G14.6)
10600 FORMAT ('Af=', 1P5G14.6)
10700 FORMAT ('Bf=', 1P5G14.6)
- STOP '[STOP in Dint in acs/macs3.f]'
+ STOP '[STOP in Dint in acs/macs3_m.f]'
END
-end module acs3
+end module acs3_m
diff --git a/sammy/src/acs/macs4.f90 b/sammy/src/acs/macs4.f90
index ea5b9bfcb46380acbfe9f2b749c282d586429ba5..a696dd5d85e50321f88c62bd0ad1e93adc6c0956 100644
--- a/sammy/src/acs/macs4.f90
+++ b/sammy/src/acs/macs4.f90
@@ -1,5 +1,5 @@
!
-module acs4
+module acs4_m
contains
!
! ______________________________________________________________________
@@ -10,7 +10,7 @@ module acs4
use fixedr_m
use z00001_common_m
use constn_common_m
- use acs6
+ use acs6_m
use xxx2
use xxx5
IMPLICIT DOUBLE PRECISION (a-h,o-z)
@@ -76,7 +76,7 @@ module acs4
use fixedr_m
use z00001_common_m
use constn_common_m
- use acs6
+ use acs6_m
use xxx2
use xxx5
IMPLICIT DOUBLE PRECISION (a-h,o-z)
@@ -316,7 +316,7 @@ module acs4
use fixedr_m
use z00001_common_m
use Endepx_common_m
- use acs6
+ use acs6_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
DIMENSION Y(21)
DATA Nnnyyy /21/
@@ -376,7 +376,8 @@ module acs4
DATA Type /'TOTA', 'INEL', 'FISS', 'CAPT', 'ELAS'/
DATA Zero /0.0d0/, One /1.0d0/
- ! JMB: data grids set up in fff
+ ! data grids were set up in fff module (Fritz Frohner's Fitacs)
+ ! TODO: maybe change when moving to general 0 K xs calc
call expData%getGrid(grid,Iset)
dataInd = grid%getDataColumn()
theoInd = dataInd+1
@@ -433,7 +434,8 @@ module acs4
END DO
END IF
- ! --- JMB: fill C++ memory to be used in fitAPI -------------------
+ ! --- fill C++ memory to be used in fitAPI -------------------
+ ! TODO: Bring FitAcs into the 0k_reconstruction framework
call grid%addData(Ienerg,1,Energy)
call grid%addData(Ienerg,dataInd,Sx(Ienerg))
call grid%addData(Ienerg,theoInd,Theory(Ienerg))
@@ -568,4 +570,4 @@ module acs4
END IF
RETURN
END
-end module acs4
+end module acs4_m
diff --git a/sammy/src/acs/macs5.f90 b/sammy/src/acs/macs5.f90
index 6d6fc5e39a3036103880a5a1ae6ac49fdb8668d5..4b11e1af4617595c11e53de4617b59b00801d012 100644
--- a/sammy/src/acs/macs5.f90
+++ b/sammy/src/acs/macs5.f90
@@ -1,5 +1,5 @@
!
-module acs5
+module acs5_m
contains
!
! ______________________________________________________________________
@@ -162,7 +162,7 @@ module acs5
!
IF (Kdtset.GT.40) WRITE (6,10000) Kdtset
10000 FORMAT ('Kdtset=',I10, 'but have only 40')
- IF (Kdtset.GT.40) STOP '[STOP in Plott2 in acs/macs5.f]'
+ IF (Kdtset.GT.40) STOP '[STOP in Plott2 in acs/macs5_m.f]'
!
New = 0
Kkkkev = Keveng
@@ -175,7 +175,7 @@ module acs5
ELSE
WRITE (6,10200) Keveng
10200 FORMAT ('Keveng=',I10)
- STOP '[STOP in Plott2 in acs/macs5.f # 2]'
+ STOP '[STOP in Plott2 in acs/macs5_m.f # 2]'
END IF
Nsntyp = 0
DO Iset=1,Kdtset
@@ -191,7 +191,7 @@ module acs5
WRITE (6,10100) I, E(I,Iset), Dum(I), Ee, Ooo
WRITE (21,10100) I, E(I,Iset), Dum(I), Ee, Ooo, De
10100 FORMAT (' E, Dum, Ee=', I5, 1P5G14.6)
- STOP '[STOP in Plott2 in acs/macs5.f # 2]'
+ STOP '[STOP in Plott2 in acs/macs5_m.f # 2]'
END IF
END DO
!
@@ -293,7 +293,7 @@ module acs5
!
200 WRITE (6,99996) Summry
99996 FORMAT (' ENDF file name is wrong: ##', A70, '##')
- STOP '[STOP in Make_File_3_Urr in acs/macs5.f]'
+ STOP '[STOP in Make_File_3_Urr in acs/macs5_m.f]'
END
-end module acs5
+end module acs5_m
diff --git a/sammy/src/acs/macs6.f90 b/sammy/src/acs/macs6.f90
index f2a68441fd45a7ad3f3e122e2c83d8ffae2b2122..93373b86d7d161c14cc29345a228ecd587d7fa7d 100644
--- a/sammy/src/acs/macs6.f90
+++ b/sammy/src/acs/macs6.f90
@@ -1,5 +1,5 @@
!
-module acs6
+module acs6_m
contains
!
! ______________________________________________________________________
@@ -115,4 +115,4 @@ module acs6
RETURN
end function Kwhich
-end module acs6
+end module acs6_m
diff --git a/sammy/src/acs/macs7.f90 b/sammy/src/acs/macs7.f90
index 2da114e01e48d4617c7a3febc14a87fd23b16add..46fb468c87613dbadce407de504f91d3fca7d1b5 100644
--- a/sammy/src/acs/macs7.f90
+++ b/sammy/src/acs/macs7.f90
@@ -1,5 +1,5 @@
!
-module acs7
+module acs7_m
contains
!
! ______________________________________________________________________
@@ -367,4 +367,4 @@ module acs7
RETURN
end function Getfff
-end module acs7
\ No newline at end of file
+end module acs7_m
\ No newline at end of file
diff --git a/sammy/src/dat/mdat0.f90 b/sammy/src/dat/mdat0.f90
index 9b1e6204ac02a7284d5df861b025b1ce6192e6fe..b796e12f02a72d718d3dcca14c6c5ea86e06d1b1 100644
--- a/sammy/src/dat/mdat0.f90
+++ b/sammy/src/dat/mdat0.f90
@@ -129,7 +129,7 @@ module Samdat_0_M
! If a second grid (if it exists) is the auxilary grid
!
call expData%destroy()
- call expData%initialize() ! why is this happening here?
+ call expData%initialize() ! we do this to make sure it's empty
call grid%initialize()
diff --git a/sammy/src/end/mout5.f b/sammy/src/end/mout5.f
index e43cea9c586e8523a380a70a5c147e7c9dacfb4d..c502d27875ad0e395535c59a9a5cf120e3a6ff5b 100644
--- a/sammy/src/end/mout5.f
+++ b/sammy/src/end/mout5.f
@@ -15,7 +15,7 @@ C
use fixedr_m
use constn_common_m
use EndfData_common_m, only : radFitFlags
- use acs6
+ use acs6_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
C
DIMENSION Anrm(3,*), Dnrm(3,*), Kktype(*), Edirin(*), Sdirin(*),
diff --git a/sammy/src/fff/mfff0.f90 b/sammy/src/fff/mfff0.f90
index 33d24534f29ff9efa6181815b42701d672b85dab..f9809757a726deb042778e8430ec84dd39f300ce 100644
--- a/sammy/src/fff/mfff0.f90
+++ b/sammy/src/fff/mfff0.f90
@@ -197,7 +197,7 @@ module fff_m
CALL Adjust_Fff (A_Kkkkex , A_Kkspin , A_Kkkpty )
!
! *** Read the cross section data
- ! JMB: also set up C++ mem. GridDataList
+ ! also set up C++ mem. GridDataList
CALL Acsinp (I_Kkktyp , I_Kkkknt , A_Kkkkex , A_Keeset , &
A_Kssset , A_Kuuset , A_Kwwset )
CLOSE (UNIT=15)
@@ -302,7 +302,7 @@ module fff_m
!
use fixedi_m
use z00001_common_m
- use acs6
+ use acs6_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
DIMENSION Spin(*), Pty(*)
DATA Zero /0.0d0/, Two /2.0d0/
diff --git a/sammy/src/fff/mfff9.f90 b/sammy/src/fff/mfff9.f90
index 354f1bca46a727afe76f9fda2cb1018bae4210a3..6aa76adb31ef63ad224cf970d57f640e0cf1118f 100644
--- a/sammy/src/fff/mfff9.f90
+++ b/sammy/src/fff/mfff9.f90
@@ -34,7 +34,7 @@ module fff9_m
IF (Kpntws.NE.0) numDataSets = Kpntws
DO I=1,numDataSets
! ----------------------------------
- ! JMB: add grids to the gridDataList
+ ! add grids to the gridDataList
! ----------------------------------
call expGrid%initialize()
dataInd = 2 ! 2 since angle-integrated and no time-shift (URR)
diff --git a/sammy/src/lru/mlru1.f b/sammy/src/lru/mlru1.f
index 218f20f8becd72c3f097ae7950eb886b33c64b96..f9a58782b7664928487e0960bbb2f7746d1a58ec 100644
--- a/sammy/src/lru/mlru1.f
+++ b/sammy/src/lru/mlru1.f
@@ -14,7 +14,7 @@ C
use namfil_common_m
use constn_common_m
use EndfData_common_m, only : radFitFlags
- use acs6
+ use acs6_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
C
DIMENSION Streng(Numelv,*), Distnt(Numelv,*), Gg(Numelv,*),
diff --git a/sammy/src/lru/mlru2.f b/sammy/src/lru/mlru2.f
index 2d7b3c0df0400e8329bd6137ac51076210268a9f..9b5af552ff36d0a8333b2c190e68ee5705f8f855 100644
--- a/sammy/src/lru/mlru2.f
+++ b/sammy/src/lru/mlru2.f
@@ -16,8 +16,8 @@ C
use constn_common_m
use EndfData_common_m
use EndfData_common_m, only : radFitFlags
- use acs4
- use acs6
+ use acs4_m
+ use acs6_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
C
DIMENSION Streng(Numelv,*), Distnt(Numelv,*), Gg(Numelv,*),
@@ -181,7 +181,7 @@ C
use ifwrit_m
use fixedr_m
use constn_common_m
- use acs6
+ use acs6_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
C
DIMENSION Bindee(*), Pairee(*), Alevel(*), Jderiv(2,*),Xderiv(2,*)
@@ -419,7 +419,7 @@ C
use constn_common_m
use EndfData_common_m
use ResonanceCovariance_M
- use acs6
+ use acs6_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
C
DIMENSION Streng(Numelv,*), Distnt(Numelv,*), Ex(*), Spin(*),
diff --git a/sammy/src/sam/sammy_api_m.f90 b/sammy/src/sam/sammy_api_m.f90
index c337a5929bde2d29623a2d7cf92acd17a555bdfd..3f3cbee868fc2c4ae4567cedc424310c9b95c83e 100755
--- a/sammy/src/sam/sammy_api_m.f90
+++ b/sammy/src/sam/sammy_api_m.f90
@@ -110,7 +110,7 @@ contains
! now get to first theory part
-
+ ! TODO: Add unresolved calc to 0K framework
if( urr_calc ) then
call sammy_do_segments('genfit')
else