ab2e5f88cd
add fields as input (for scheduler)
2019-05-24 15:57:30 +01:00
f244fed6ab
cleaning up Kl2 contraction
2019-05-24 13:08:35 +01:00
c7c0a1065f
Merge pull request #214 from guelpers/feature/kl2QEDseq
...
Kl2 contraction with sequential propagators
2019-05-23 20:31:41 +01:00
e43d59045e
add option mom to MSource::Gauss
2019-05-23 17:33:32 +01:00
e553678599
add modules MSource::Gauss and MSource::Convolution
2019-05-23 16:38:13 +01:00
9a34edcf9f
Kl2 QED cleanup
2019-05-23 13:43:22 +01:00
fionnoh
246f10001e
Added ZFIMPL to SeqGamma
2019-05-23 12:42:40 +01:00
fionnoh
a66d110b88
Added ZFIMPL to SeqConserved module
2019-05-23 11:49:54 +01:00
ae5ad986e2
Merge remote-tracking branch 'upstream/develop' into feature/kl2QED
2019-05-19 14:35:46 +01:00
fionnoh
dbd7f3f0fc
Added variables that were missing from wall source setup
2019-05-17 19:10:09 +01:00
fionnoh
d14512ee03
Exposed a coulomb/landau enum to the gauge fixing module
2019-05-17 19:01:52 +01:00
Felix Erben
8ce7ebdca3
fixed contraction issue
2019-05-17 10:52:55 +01:00
Felix Erben
435653490e
fixed contraction issue
2019-05-17 10:50:15 +01:00
Michael Marshall
10a052d695
3 issues preventing compilation under clang. Marked these with FELIX_ISSUE and made minimal change to make compile (as fix not obvious)
2019-05-17 09:59:01 +01:00
Felix Erben
acd5a01b65
some work on baryons
2019-05-16 15:11:50 +01:00
fionnoh
ce102ac550
More logging, timing, and 4d/5d logic for eigpack gauge transforms
2019-05-15 14:31:25 +01:00
fionnoh
94accec311
Added gauge transform option to eigpack IO
2019-05-15 13:35:47 +01:00
Michael Marshall
ec7d96ce3b
Merge branch 'develop' into feature/distil
...
* develop:
Hadron WeakEye and A2ALoop bug fixes, and WWVVContraction bug fix
DiskVector: fix of memory bug triggering segfault when the cache is accessed following a certain pattern
MFermion::GaugeProp fix for 4d fields
2019-05-14 13:10:40 +01:00
d8512b03f8
Merge pull request #195 from nils-asmussen/fix_GaugeProp_4d
...
MFermion::GaugeProp fix for 4d fields
2019-05-12 21:31:18 +02:00
79e930ba12
Hadrons: Lepton Propagator for kl2, sign swap for antiperiodic boundary
2019-05-10 12:46:18 +01:00
fionnoh
2acd8ece65
Hadron WeakEye and A2ALoop bug fixes, and WWVVContraction bug fix
2019-05-08 10:57:36 +01:00
Michael Marshall
c16916cc45
Multiple local slice fixes
2019-05-06 10:35:42 +01:00
Michael Marshall
ec24a1f828
Fixed 2 bugs in LapEvec: 1) InsertLocalSlice 2) ensure convergence assertion stops entire machine
2019-05-03 16:03:56 +01:00
Michael Marshall
b7ead6c16a
Fixed bug: iff stout smearing disabled then gauge field uninitialised
2019-05-02 18:20:49 +01:00
Michael Marshall
a3fe57f430
NamedTensor writes to tag NamedTensor by default (not filename) - so still usable in case user renames file.
...
Also tweaked tensor index name checking (which is used to ensure tensor is correct type)
2019-05-01 18:11:37 +01:00
Michael Marshall
8dc0587621
Post Michael / Felix review. Ready for Peter / Antonin review
2019-05-01 13:04:51 +01:00
Michael Marshall
cfe5fa7a35
1) Don't write Laplacian eigenvectors to disk 2) Add a test that loads perambulators from disk
2019-05-01 09:50:23 +01:00
Michael Marshall
e72e26c899
Get rid of unnecessary multiFile options
2019-05-01 08:53:08 +01:00
Michael Marshall
334f29becb
Fairly close to ready for release. Felix and I to review, then submit for release
2019-04-30 23:53:57 +01:00
Michael Marshall
e56ead55ef
WIP
2019-04-30 14:41:48 +01:00
4f0631615f
A2A Lepton-Meson Field contraction
2019-04-30 12:04:59 +01:00
Michael Marshall
d74d443d1b
Pre-release cleanup in progress
2019-04-29 22:18:29 +01:00
Michael Marshall
4203105104
Part-way through release tidy-up
2019-04-29 18:40:38 +01:00
c2cd0e15d7
Merge remote-tracking branch 'upstream/develop' into feature/kl2QED
...
Conflicts:
Grid/qcd/action/fermion/DomainWallFermion.h
Grid/qcd/action/fermion/FermionOperator.h
2019-04-29 12:07:20 +01:00
Michael Marshall
c48ae4f3ad
1) Only the boss should write the perambulator - possibly was a source of intermittent corruption?
...
2) Implemented and test a perambulator conversion utility in Test_distil (commented out near the start of main)
2019-04-28 23:24:57 +01:00
Michael Marshall
fb74de0798
Making sure Hdf5 is an optional dependency (default to binary writer if not present)
2019-04-28 20:23:44 +01:00
Michael Marshall
adc1eaee68
Switched to Hdf5 format for perambulators. Ready for first test on Tesseract.
2019-04-28 17:53:42 +01:00
Michael Marshall
3ac5a69a57
Ready to test spatial smearing (again)
2019-04-26 08:54:30 +01:00
Michael Marshall
8419fbb335
Renamed PerambLight module. Check with Felix whether Test_24 and Test_tesseract still need to be maintained
2019-04-26 08:23:15 +01:00
Michael Marshall
23a9b93cda
More dependencies for Distil.hpp move and (C) 2019 only
2019-04-26 07:39:05 +01:00
Michael Marshall
ecdc3ddebf
Moved Distil.hpp and added GNU license to all files
2019-04-26 07:24:56 +01:00
Michael Marshall
a97b814f0c
Remove redundancy in LapEvec filename
2019-04-19 14:09:36 +01:00
Michael Marshall
7214681e11
Spatial smearing doesn't work yet. Fixed inconsistency in naming of perambulator in PerambLight.hpp
2019-04-19 13:54:25 +01:00
Michael Marshall
143b75956c
Stout smearing 3D fixes. Changed LapEvec to perform spatial smearing only
2019-04-19 11:54:02 +01:00
Felix Erben
4a4203c610
fixed stout smearing for now
2019-04-18 19:10:49 +01:00
Felix Erben
2b598294c9
added distil source module
2019-04-18 17:47:09 +01:00
00963a7499
twist and boundary conditions for free propagator
2019-04-05 10:08:27 +01:00
Felix Erben
5e6104e683
Merge branch 'feature/distil' of https://github.com/mmphys/Grid into feature/distil
2019-04-04 12:13:35 +01:00
Felix Erben
25e4ee3a49
3D Stout smearing added
2019-04-04 12:13:16 +01:00
Michael Marshall
b5eb97206b
Merge branch 'develop' into feature/distil
...
* develop:
MGauge::GaugeFix use standard convention for fields
fix bug: MGauge::GaugeFix should not modify its input
add gauge transformation matrix as output to module MGauge/GaugeFix
2019-04-03 16:24:49 +01:00
72f959c0b8
MGauge::GaugeFix use standard convention for fields
2019-03-29 16:51:21 +00:00
63001d3fa6
fix bug: MGauge::GaugeFix should not modify its input
2019-03-29 16:51:11 +00:00
b1d3d1f1a9
add gauge transformation matrix as output to module MGauge/GaugeFix
2019-03-29 16:51:00 +00:00
c2250fa124
MFermion::GaugeProp fix for 4d fields
2019-03-29 16:36:56 +00:00
84940fbdf0
Hadrons: Lepton Propagator for kl2
2019-03-28 10:15:09 +00:00
ferben
f757b80e1c
tried to fix mem leak
2019-03-27 12:00:36 +00:00
Michael Marshall
9fce1263be
Fixed bug in LapEvec if machine running spread-out in time
2019-03-26 13:24:39 +00:00
Michael Marshall
ae565b006a
Compiling in single-precision now works
2019-03-25 22:56:01 +00:00
Michael Marshall
8502660023
Begin fixes for single precision
2019-03-25 20:40:05 +00:00
Felix Erben
ce501afec6
bugfix
2019-03-25 16:38:25 +00:00
Felix Erben
48b03c4590
bugfix
2019-03-25 15:45:35 +00:00
ferben
b3b9e608e1
added new module for noises
2019-03-25 14:13:03 +00:00
ferben
4fc045b563
added module to load perambulators from disk
2019-03-22 13:50:47 +00:00
ferben
fbf286b0e3
added Spin dilution
2019-03-22 13:30:11 +00:00
ferben
a66bb8acba
fixed possible memory leak
2019-03-20 14:41:36 +00:00
ferben
4ae35000a9
removed module which we do not need
2019-03-20 13:36:57 +00:00
Michael Marshall
11dded61e8
Merge branch 'develop' into feature/distil
...
* develop: (29 commits)
precision fix
Updates after review with Peter.
Wilson clover multi grid for lime lattice
Recommendations for Traits classes
Hadrons: uninitialised pointer fix (might have been harmless)
Hadrons: beware of the nasty uninitialised twists
Smearing test. Test on free field.
Smearing for quark observables
Smearing
Hadrons: XML validator utility
display relative norm during field IO norm check
possibility to set a build number
IO norm check on relative norm
Output field norm check during IO
Hadrons: random vector utility module I/O
quieter initialisation
fix patch command for eigen in bootstrap.sh
Mres changes and gauge xform mat changes
Hadrons: 32 bit I/O directly in Lanczos module
Hadrons: copyright update
...
# Conflicts:
# Grid/tensors/Tensor_traits.h
# Hadrons/Modules.hpp
# Hadrons/modules.inc
2019-03-20 10:35:36 +00:00
Felix Erben
d1fe4dce33
new idea to get multiple perambulators
2019-03-15 10:28:02 +00:00
ferben
50ca3101de
bug in multiSolves and new test prog
2019-03-13 17:25:55 +00:00
ferben
0faf40e207
last commit did not compile - fxied this
2019-03-13 13:24:18 +00:00
ferben
5313e44d11
some cleanup
2019-03-13 13:15:12 +00:00
ferben
6bb9b67c93
externalised gauge field reading to hadrons module
2019-03-13 12:09:12 +00:00
a0405c6d84
PerambMultipleSolves.hpp compiles (not had time to test)
2019-03-12 14:01:29 +00:00
ferben
c2a3231cdf
added testing module for multiple perambulators
2019-03-11 18:05:39 +00:00
ferben
608a98d870
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-03-08 16:28:34 +00:00
ferben
2df396380d
solver is now external
2019-03-08 16:28:21 +00:00
Felix Erben
64ba664637
changed debug options
2019-03-08 12:25:00 +00:00
ferben
4a70b2ffd4
Aslash insertions work now?
2019-03-08 12:23:22 +00:00
Felix Erben
dde118fed9
added everythong to compute sequential aslash fields
2019-03-07 17:36:53 +00:00
Felix Erben
1538bf8c34
added everythong to compute sequential aslash fields
2019-03-07 17:36:22 +00:00
Felix Erben
93dfbfbfcd
added module to compute perambulator from a solve
2019-03-07 15:33:50 +00:00
d3935ae7fc
Hadrons: some updates in WeakMesonDecayKl2
2019-03-06 15:27:59 +00:00
ferben
d716f8a0c9
new module for baryon contraction
2019-03-06 13:55:36 +00:00
0b426bf9f6
Merge remote-tracking branch 'upstream/develop' into feature/kl2QED
...
Conflicts:
Hadrons/Modules.hpp
Hadrons/modules.inc
2019-03-06 11:28:59 +00:00
ferben
d7c7bff065
added output for source meson fields on all tsrc
2019-03-05 12:01:55 +00:00
bdf87bc994
Hadrons: beware of the nasty uninitialised twists
2019-02-27 02:27:09 +00:00
Felix Erben
df065f1d57
first test configs
2019-02-26 15:57:01 +00:00
ferben
76b6e8a01e
first tesseract test
2019-02-25 11:18:25 +00:00
ferben
cad26a736e
quick&dirty fix for g5*field
2019-02-22 17:05:16 +00:00
Felix Erben
03d031d623
tesserct test
2019-02-22 16:30:22 +00:00
ferben
5d6462b706
bugfix
2019-02-21 11:13:10 +00:00
f70c5b004a
some cleanup in Baryon2pt
2019-02-20 12:56:13 +00:00
ferben
4522f1e831
separated final 2pt Contraction
2019-02-19 17:22:30 +00:00
ferben
6e822b7201
added sign for contraction sum
2019-02-18 15:21:13 +00:00
ferben
625ccfcd72
continued baryon contraction code
2019-02-18 13:10:34 +00:00
ferben
bfd2770657
started on baryon flavour sums
2019-02-15 15:51:46 +00:00
ferben
668b1e77c7
small changes
2019-02-15 15:31:53 +00:00
ferben
e0987d7d81
first contraction version done
2019-02-15 14:32:17 +00:00
ferben
a111d814db
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-02-15 10:47:41 +00:00
886c895f81
baryon field structure is now eigentensor - started on contractions for 2pt functions
2019-02-14 16:44:54 +00:00
ferben
9f2ca98dfc
enseble can now be specified in LapEvec
2019-02-13 13:54:31 +00:00
ferben
d889cebc60
unique string is now used
2019-02-11 17:39:42 +00:00
7672bb6434
Hadrons: random vector utility module I/O
2019-02-10 21:25:25 +00:00
ferben
c4d27ee30f
added parity operator to baryon fields
2019-02-08 15:49:52 +00:00
ferben
d26a5dce12
bugfix
2019-02-08 14:37:09 +00:00
ferben
5843a943d9
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-02-08 14:36:08 +00:00
ferben
c1341b8ed2
bugfix
2019-02-08 14:33:06 +00:00
6a4515d0cd
baryons have now the correct (?) structure - also easier!
2019-02-07 12:27:57 +00:00
a0a39e4b00
Fixed initialisation of vector of Complex
2019-02-06 21:56:44 +00:00
ferben
cbd2dfe53f
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-02-06 12:56:49 +00:00
ferben
6cdb1eb62c
BContraction now computes what might be a baryon function, but probably isn't
2019-02-06 12:23:52 +00:00
ed7175076b
Turned off warning of unused variable line 150
2019-02-06 09:32:13 +00:00
27677b3870
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-02-06 09:25:39 +00:00
7423f5af1a
Examples of how to access Grid Tensors
2019-02-06 09:25:24 +00:00
74c38822ed
Hadrons: 32 bit I/O directly in Lanczos module
2019-02-05 21:56:51 +00:00
318c64adc2
Hadrons: copyright update
2019-02-05 19:13:37 +00:00
d5b053f86f
Hadrons: 1 propagator loop construction now using A2A vectors
2019-02-05 19:12:38 +00:00
c60e50e3cb
Hadrons: copyright update
2019-02-05 18:55:24 +00:00
08d8b1d5fb
Hadrons: 4-quark eye 3-pt contractions
2019-02-05 18:53:20 +00:00
ferben
21d6dbe0b6
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-02-05 17:32:39 +00:00
ferben
1ee84509b5
added baryons project - not working yet
2019-02-05 17:32:26 +00:00
57e57d162f
Removed Eigen::DontAlign attribute
2019-02-05 12:50:28 +00:00
90d6d28547
Hadrons: non-eye weak 3pt fix
2019-02-05 11:35:10 +00:00
5b0870bb19
Added Scalar_ length and Scalar_Unit_Size to Perambulator file for validation
2019-02-05 09:07:05 +00:00
7f5354630a
Updated perambulator binary format to save payload in big endian format on disk
2019-02-04 23:07:59 +00:00
2eb584fdf0
Hadrons: 4-quark non-eye 3-pt contractions
2019-02-04 21:24:07 +00:00
6b46834af8
Hadrons: archiving unmaintained or exotic modules
2019-02-04 21:23:30 +00:00
008ac6b5ae
Permabulator is read back from disk if it exists instead of being created
2019-02-04 12:06:32 +00:00
c7aa4e0c1f
Perambulator filename can be specified in xml. NB: Perambulator binary format now includes data size in bytes to avoid type mismatches.
2019-02-04 11:30:30 +00:00
43bd918a47
Logging tweak
2019-02-03 21:48:50 +00:00
7eda54bb87
Only write indices with dimesion!=1
2019-02-03 20:58:58 +00:00
bd75b843fa
Added checksum to data
2019-02-03 20:31:42 +00:00
8865bf5d7c
Implemented perambulator read/write ... but in binary format. Will switch to Hdf5 when I have Antonins feedback
2019-02-03 17:05:19 +00:00
ferben
caabbcd951
minor change
2019-02-01 17:50:18 +00:00
48528c5b1d
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
...
Added index names to Perambulator
2019-02-01 15:31:27 +00:00
f7b90a0c14
Added index names to perambulator
2019-02-01 15:20:35 +00:00
ferben
a9848becb0
unsmeared sinks can now be computed - new test program available
2019-02-01 13:23:42 +00:00
7cc13f48d5
added some TODO comments; needs discussion
2019-01-31 16:54:11 +00:00
d7dc617746
Switched perambulator to sue Eigen::Tensor (file write temporarily excluded)
2019-01-31 15:06:52 +00:00
48b6f7e6ad
Changed PerambLight<FIMPL> to PerambLight<GIMPL>
2019-01-31 12:37:00 +00:00
0da411fe60
LapEvec fixes
2019-01-31 12:28:38 +00:00
d7b9ed199d
PerambLight fixes
2019-01-31 12:24:32 +00:00
7e74f7bec4
tsrc != 0 now works
2019-01-31 11:35:05 +00:00
dae7b30b92
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-01-30 21:16:30 +00:00
f7e4661ca0
Fixed grid3d leak in PerambLight
2019-01-30 21:16:09 +00:00
ferben
7b66197534
meson fields are now the same
2019-01-30 18:03:34 +00:00
ferben
c3273eff20
agreement up to laph vectors
2019-01-30 11:20:22 +00:00
ferben
67a3d7aeed
added debug output, perambulators now agree up to 8 digits
2019-01-29 16:24:59 +00:00
c7ceff6a21
Switched to Gauge field (GIMPL)
2019-01-28 12:28:35 +00:00
ferben
5580b3a7d1
bugfix in DistilVectors
2019-01-28 12:24:47 +00:00
ferben
aea49bc349
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-01-25 13:44:30 +00:00
ferben
9ef6f9878e
test works up to perambulators now
2019-01-25 13:44:19 +00:00
708ca8585a
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-01-25 13:26:56 +00:00
d15bf4b8e1
Added trajectory number to output file
2019-01-25 13:26:48 +00:00
ferben
7496da0987
bugfix in prambLight
2019-01-25 13:08:56 +00:00
ferben
2568f5b925
bugfix in prambLight
2019-01-25 12:37:18 +00:00
577cdf1d72
Simplified tests
2019-01-24 18:50:18 +00:00
dfb7fb1d9f
LapEvec test works on --grid 4.4.4.8
2019-01-24 16:30:13 +00:00
cf85f0388d
Still debugging eigenvector parameters
2019-01-24 13:26:05 +00:00
00b0f75b0d
Eigenvectors created. Still need to correctly set parameters for test.
2019-01-24 12:44:06 +00:00
b45586e81c
Discovered bug root cause. setup() is called multiple times. Now ready to copy-paste the LapEvec code
2019-01-23 21:17:56 +00:00
2c7e6bf58b
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-01-23 15:20:06 +00:00
7c5a06f6d0
Trying to work out why LapEvec constructor not being called
2019-01-23 15:19:51 +00:00
ferben
068ef85b05
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
2019-01-23 15:08:24 +00:00
ferben
a6ab742fdb
added perambs to test
2019-01-23 13:58:20 +00:00
3d3e8f4f9f
Structured objects passed into LapEvec
2019-01-23 12:59:55 +00:00
ferben
d7908c33de
moved hard-coded parameters in DistilVectors to module input
2019-01-23 11:32:53 +00:00
ferben
4cc2ebc9e4
moved hard-coded parameters to module input
2019-01-23 11:26:07 +00:00
09fa821510
Added remaining methods to Permabulator
2019-01-22 17:59:55 +00:00
ferben
f45d2d5dcc
perambLight done, but SliceShare and Write does not work yet
2019-01-22 15:52:26 +00:00
ferben
0a82fae45c
moved perambulator definition to shared header file
2019-01-22 15:06:45 +00:00
ferben
46b05aa9c5
cleaned up, deleted commented out old code
2019-01-22 13:48:44 +00:00
ferben
813c1ab1f1
Merge branch 'feature/distil' of https://github.com/mmphys/Grid into feature/distil
2019-01-22 13:28:09 +00:00
ferben
b1c27a141d
DistilVectors complete and compiling - not tested at all!
2019-01-22 13:27:51 +00:00
81bb361299
Test program ready
2019-01-22 13:19:39 +00:00
ferben
79d533550d
continued on DistilVectors.hpp
2019-01-21 16:45:31 +00:00
ferben
b8c106f320
working on DistilVectors, initialisation done and compiles
2019-01-21 16:04:18 +00:00
Felix Erben
0ff410ae19
copied perambulato code into PerambLight.hpp
2019-01-18 17:47:41 +00:00
Felix Erben
ced30b61e2
added phi vectors - still commented out and does not compile otherwise
2019-01-18 16:38:13 +00:00
Felix Erben
2b782df290
Merge branch 'feature/distil' of https://github.com/mmphys/Grid into feature/distil
2019-01-18 15:58:51 +00:00
Felix Erben
f0f1ba0307
uses evec4d now
2019-01-18 15:58:10 +00:00
2343e621e6
Bananas
2019-01-18 13:32:27 +00:00
Felix Erben
2568504821
small change
2019-01-18 13:23:03 +00:00
b821dde020
Initial version
2019-01-18 13:14:28 +00:00
Vera Guelpers
447b772136
Merge remote-tracking branch 'upstream/develop' into feature/kl2QED
2019-01-07 15:09:18 +00:00
Peter Boyle
c5e081d69c
Re-Merge branch 'develop' into feature/gpu-port
...
Pull in Regensburg MultiGrid pull request
2019-01-03 01:50:16 +00:00
Peter Boyle
802404c78c
Remove warnings under NVCC and move parallel_for to thread-loop
2019-01-01 15:08:09 +00:00
Peter Boyle
d5db5f5242
Wrong dimension used in a temporary
2018-12-20 10:49:45 +00:00
Vera Guelpers
943fa48ce4
Hadrons: Kl2 contraction using sequential propagators
2018-12-14 13:45:30 +00:00
Vera Guelpers
fa97a56fdd
Hadrons: sequential Aslash insertion on propagator
2018-12-14 12:40:26 +00:00
856476a890
big cleanup of the Photon class + QED Coulomb gauge
2018-12-13 21:52:38 +00:00
Peter Boyle
b57a4d32aa
Merge branch 'develop' into feature/gpu-port
2018-12-13 05:11:34 +00:00
c7f33ca2a8
Revert "Hadrons: A2A vector write can fail and retry"
...
This reverts commit 10fc263675
2018-11-27 17:27:26 +00:00
10fc263675
Hadrons: A2A vector write can fail and retry
2018-11-26 19:47:03 +00:00
e232257cb6
Hadrons: A2AAslashVector modul cleaning and renaming
2018-11-22 19:43:49 +00:00
6364aa8acf
Merge branch 'feature/contractor' into develop
2018-11-22 15:44:46 +00:00
f22a27d7f9
Hadrons: contractor trajectory loop and file output
2018-11-19 15:45:04 +00:00
Vera Guelpers
a7e3977b75
Merge remote-tracking branch 'upstream/develop' into develop
2018-11-13 14:56:23 +00:00
Vera Guelpers
995f20e45d
Hadrons: some renamings
2018-11-13 14:54:48 +00:00
Vera Guelpers
d058b4e681
Merge branch 'feature/seqA2A' into develop
2018-11-13 13:27:24 +00:00
