| 3c51d01 | Veronica K. Berglyd Olsen | 26 July 2018, 10:12:46 UTC | Merge branch 'master' into combinedFunction | 26 July 2018, 10:12:46 UTC |
| 68fbf44 | James Molson | 25 July 2018, 13:48:53 UTC | Merge pull request #589 from JamesMolson/dev_testing Root updates + temporary backtracking fix | 25 July 2018, 13:48:53 UTC |
| 3fa608c | James Molson | 24 July 2018, 14:27:19 UTC | Enable the option to dump the turns vs particle count root output if collimation is not enabled. | 24 July 2018, 14:27:19 UTC |
| a8eeb48 | James Molson | 24 July 2018, 11:20:40 UTC | Add a temporary fix for the online aperture check backtracking. | 24 July 2018, 11:20:40 UTC |
| a0b75c6 | James Molson | 24 July 2018, 10:47:42 UTC | Merge pull request #588 from vkbo/print_flag_fix Fix for PRINT block conflict with LIMI block | 24 July 2018, 10:47:42 UTC |
| 6f1f9af | Veronica K. B. Olsen | 23 July 2018, 22:58:13 UTC | Bug fix in abend. | 23 July 2018, 22:58:13 UTC |
| 13bba45 | Veronica K. B. Olsen | 23 July 2018, 22:51:27 UTC | Fixed parsing of the PRINT block which conflicted with the PRIN command in the LIMI block. | 23 July 2018, 22:51:27 UTC |
| cc90f22 | Veronica K. Berglyd Olsen | 23 July 2018, 15:07:15 UTC | Merge pull request #587 from JamesMolson/dev_testing Build system updates. | 23 July 2018, 15:07:15 UTC |
| 5996a28 | James Molson | 23 July 2018, 15:01:50 UTC | Do not pass the "lxplus" option to cmake. | 23 July 2018, 15:01:50 UTC |
| 9dd06f7 | Veronica K. Berglyd Olsen | 23 July 2018, 14:46:12 UTC | Update main_cr.f90 Shortened and aligned the build details for the SixTrack fort.6 header. | 23 July 2018, 14:46:12 UTC |
| 8df2736 | James Molson | 23 July 2018, 14:25:18 UTC | Fix printing the output path correctly. | 23 July 2018, 14:25:18 UTC |
| 5df6a45 | James Molson | 23 July 2018, 14:24:24 UTC | Fix typo. | 23 July 2018, 14:24:24 UTC |
| 5d6afa2 | James Molson | 23 July 2018, 13:48:53 UTC | Print git hash by sixtrack at run time. Add checks for the needed compiler features and print errors if they are not found. | 23 July 2018, 13:48:53 UTC |
| c71ffa3 | James Molson | 23 July 2018, 13:18:58 UTC | Remove tab char | 23 July 2018, 13:18:58 UTC |
| 2435c5c | James Molson | 23 July 2018, 10:48:00 UTC | Merge branch 'master' into combinedFunction | 23 July 2018, 10:48:00 UTC |
| 832f4de | root | 23 July 2018, 08:14:41 UTC | Forgot to update the fort.90 in last commmit. | 23 July 2018, 08:14:41 UTC |
| 6c82b81 | Veronica K. Berglyd Olsen | 20 July 2018, 20:30:00 UTC | Merge pull request #586 from kyrsjo/delete_tshift Delete unused file tshift_corr.f90 | 20 July 2018, 20:30:00 UTC |
| 45ccb4b | Kyrre Sjobak | 20 July 2018, 20:24:18 UTC | Delete unused file tshift_corr.f90 | 20 July 2018, 20:24:18 UTC |
| 7a0de69 | Kyrre Ness Sjøbæk | 20 July 2018, 17:52:22 UTC | Merge pull request #581 from vkbo/custom_input_read Custom input read and output rounding | 20 July 2018, 17:52:22 UTC |
| b2918a4 | Veronica K. B. Olsen | 20 July 2018, 17:45:34 UTC | Added a few TODO comments. | 20 July 2018, 17:45:34 UTC |
| 5ccab7b | tobias | 20 July 2018, 11:48:55 UTC | Documentation and vertical combined function magnet. | 20 July 2018, 11:48:55 UTC |
| 25d836f | Veronica K. Berglyd Olsen | 19 July 2018, 17:34:50 UTC | Merge branch 'master' into custom_input_read | 19 July 2018, 17:34:50 UTC |
| 184d81d | Veronica K. Berglyd Olsen | 19 July 2018, 17:31:54 UTC | Merge pull request #579 from vkbo/cleanup_and_fixes Minor cleanup and fixes | 19 July 2018, 17:31:54 UTC |
| 6120c04 | Veronica K. B. Olsen | 19 July 2018, 17:21:51 UTC | Merge remote-tracking branch 'upstream/master' into custom_input_read | 19 July 2018, 17:21:51 UTC |
| 7dbb59f | Veronica K. B. Olsen | 19 July 2018, 17:16:44 UTC | Removed dtostr routine from sixtrack and cleaned up rounderr. | 19 July 2018, 17:16:44 UTC |
| 0123a9d | Veronica K. B. Olsen | 19 July 2018, 17:16:19 UTC | Replaced dtostr with chr_fromReal in postprocessing. | 19 July 2018, 17:16:19 UTC |
| 92817a2 | Veronica K. B. Olsen | 19 July 2018, 17:16:03 UTC | Replaced dtostr with chr_fromReal in end_sixtrack. | 19 July 2018, 17:16:03 UTC |
| f7aa47c | Veronica K. B. Olsen | 19 July 2018, 17:15:42 UTC | Replaced dtostr with chr_fromReal in module bdex. | 19 July 2018, 17:15:42 UTC |
| 28c8f99 | Veronica K. B. Olsen | 19 July 2018, 16:53:05 UTC | Replaced dtostr with chr_fromReal in subroutine umlauda. | 19 July 2018, 16:53:05 UTC |
| e7b4d25 | tobias | 19 July 2018, 16:41:02 UTC | Added the files for the tests. I wait with the canonicals until we have decided the implementation. | 19 July 2018, 16:41:02 UTC |
| 983e732 | tobias | 19 July 2018, 16:29:33 UTC | Horizontal combined function magnet is implemented. | 19 July 2018, 16:29:33 UTC |
| 2bf1a59 | Veronica K. B. Olsen | 19 July 2018, 16:27:05 UTC | Commented out some new code that broke CR. | 19 July 2018, 16:27:05 UTC |
| 4b4c51b | Veronica K. B. Olsen | 19 July 2018, 16:09:12 UTC | Cleaned out all the old splitfld related code no longer in use. | 19 July 2018, 16:09:12 UTC |
| a62f526 | Riccardo De Maria | 19 July 2018, 16:00:13 UTC | Merge branch 'master' into cleanup_and_fixes | 19 July 2018, 16:00:13 UTC |
| 380329d | Riccardo De Maria | 19 July 2018, 15:59:53 UTC | Merge pull request #578 from JamesMolson/dev_testing FLUKA and ROOT updates. | 19 July 2018, 15:59:53 UTC |
| 40cadf7 | Veronica K. B. Olsen | 19 July 2018, 15:53:59 UTC | Rwwritten reading of fort.10 in sumpos, but the ouptut still needs major cleanup. | 19 July 2018, 15:53:59 UTC |
| df8543d | Veronica K. B. Olsen | 19 July 2018, 15:32:44 UTC | Finished the parsing code for fort.33 | 19 July 2018, 15:32:44 UTC |
| beea20f | Veronica K. B. Olsen | 19 July 2018, 14:39:43 UTC | Added module read_input and moved reading of fort.33 there. | 19 July 2018, 14:39:43 UTC |
| fb4a623 | James Molson | 19 July 2018, 13:36:30 UTC | Only write FLUKA_ENTRY points to ROOT. | 19 July 2018, 13:36:30 UTC |
| 5fdac86 | James Molson | 19 July 2018, 13:26:07 UTC | Do not use an un-allocated pointer. | 19 July 2018, 13:26:07 UTC |
| cb0905f | Veronica K. B. Olsen | 19 July 2018, 13:21:20 UTC | Changed cmake version requirement to 3.0 | 19 July 2018, 13:21:20 UTC |
| 0b65f5a | James Molson | 19 July 2018, 12:54:28 UTC | FLUKA updates: handle the root init correctly now, and add some debugging writes when reading the network.nfo. | 19 July 2018, 12:54:28 UTC |
| dbca3f2 | tobias | 19 July 2018, 12:53:07 UTC | Checks if there is a virtual length or not. | 19 July 2018, 12:53:07 UTC |
| c78032e | James Molson | 19 July 2018, 10:33:21 UTC | Merge remote-tracking branch 'upstream/master' into dev_testing | 19 July 2018, 10:33:21 UTC |
| e515239 | tobias | 19 July 2018, 09:51:45 UTC | Horizontal combined function implemented. | 19 July 2018, 09:51:45 UTC |
| cdef300 | James Molson | 18 July 2018, 15:50:14 UTC | FLUKA updates. | 18 July 2018, 15:50:14 UTC |
| 84a3359 | Veronica K. Berglyd Olsen | 18 July 2018, 15:29:13 UTC | Merge pull request #577 from vkbo/doc_updates Added non-breaking spaces to README author list. | 18 July 2018, 15:29:13 UTC |
| 7089db6 | Veronica K. B. Olsen | 18 July 2018, 15:28:19 UTC | Added non-breaking spaces to README author list. | 18 July 2018, 15:28:19 UTC |
| 4bb0fb1 | Veronica K. Berglyd Olsen | 18 July 2018, 15:22:59 UTC | Merge pull request #576 from vkbo/doc_updates Updated README | 18 July 2018, 15:22:59 UTC |
| 5228a4c | Veronica K. B. Olsen | 18 July 2018, 15:22:05 UTC | Moved CERN logo to the right hand side. | 18 July 2018, 15:22:05 UTC |
| b7b6b7f | Veronica K. B. Olsen | 18 July 2018, 15:20:21 UTC | Updated the CERN logo to one with a white background. | 18 July 2018, 15:20:21 UTC |
| 7fbaa73 | James Molson | 18 July 2018, 15:19:09 UTC | Dump out the FLUKA insertion id -> name conversion tree for FLUKA root output. | 18 July 2018, 15:19:09 UTC |
| 05f8c24 | Veronica K. B. Olsen | 18 July 2018, 15:13:39 UTC | Updated README. | 18 July 2018, 15:13:39 UTC |
| b93c092 | Veronica K. B. Olsen | 18 July 2018, 14:53:17 UTC | Tweaked .gitignore. | 18 July 2018, 14:53:17 UTC |
| 854cc7f | Veronica K. B. Olsen | 18 July 2018, 14:51:15 UTC | Reverted some changes made to .gitignore. | 18 July 2018, 14:51:15 UTC |
| a561ebf | Veronica K. Berglyd Olsen | 18 July 2018, 14:05:31 UTC | Merge pull request #575 from vkbo/release_5rc4 Killing the RC4 branch. | 18 July 2018, 14:05:31 UTC |
| a47b88e | Veronica K. B. Olsen | 18 July 2018, 13:53:53 UTC | Merge remote-tracking branch 'upstream/master' into release_5rc4 | 18 July 2018, 13:53:53 UTC |
| f46e02e | Veronica K. Berglyd Olsen | 18 July 2018, 12:53:49 UTC | Merge pull request #574 from SixTrack/minor-readme Update README.md | 18 July 2018, 12:53:49 UTC |
| 77b14ea | James Molson | 18 July 2018, 11:39:40 UTC | Merge pull request #573 from JamesMolson/dev_testing root updates + aperture printing | 18 July 2018, 11:39:40 UTC |
| 0ca57b4 | James Molson | 18 July 2018, 11:31:15 UTC | Print out plost instead of ipart in the root aperture dump. Now builds with collimation disabled. | 18 July 2018, 11:31:15 UTC |
| cb0f2f8 | James Molson | 18 July 2018, 11:27:12 UTC | Merge remote-tracking branch 'upstream/master' into dev_testing | 18 July 2018, 11:27:12 UTC |
| f0016c5 | James Molson | 18 July 2018, 11:23:23 UTC | Add aperture loss output when running with the FLUKA coupling. | 18 July 2018, 11:23:23 UTC |
| 12169da | Riccardo De Maria | 17 July 2018, 15:13:07 UTC | Update README.md | 17 July 2018, 15:13:07 UTC |
| 54d8d70 | James Molson | 17 July 2018, 14:55:08 UTC | Fix headers in the aperture loss dump file. | 17 July 2018, 14:55:08 UTC |
| af50f32 | James Molson | 17 July 2018, 14:53:13 UTC | Merge remote-tracking branch 'upstream/master' into dev_testing | 17 July 2018, 14:53:13 UTC |
| cc0a449 | Riccardo De Maria | 17 July 2018, 12:42:12 UTC | Merge pull request #572 from rdemaria/master no change | 17 July 2018, 12:42:12 UTC |
| 9ba74f2 | Riccardo De Maria | 17 July 2018, 12:34:55 UTC | Met push origin masterrge branch 'master' of github.com:SixTrack/SixTrack | 17 July 2018, 12:34:55 UTC |
| a84490a | Riccardo De Maria | 17 July 2018, 12:34:34 UTC | Fix bad pull request (#571) fix text | 17 July 2018, 12:34:34 UTC |
| 2ecf880 | Riccardo De Maria | 17 July 2018, 12:32:52 UTC | merge | 17 July 2018, 12:32:52 UTC |
| ea852d5 | Riccardo De Maria | 17 July 2018, 12:26:11 UTC | Merge branch 'master' of github.com:rdemaria/SixTrack | 17 July 2018, 12:26:11 UTC |
| f407a9b | Riccardo De Maria | 17 July 2018, 12:24:02 UTC | Add dev cheetsheet and CI integration (#570) * adding dev sheet cheat to the doc tree * Create .travis.yml * Update .travis.yml * Create config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml | 17 July 2018, 12:24:02 UTC |
| 77fea46 | Riccardo De Maria | 17 July 2018, 12:20:18 UTC | Merge pull request #3 from rdemaria/rdemaria-patch-2 Update config.yml | 17 July 2018, 12:20:18 UTC |
| f11a8f2 | James Molson | 17 July 2018, 12:03:08 UTC | Merge pull request #569 from amereghe/onlineApeCheck_fixes Online aperture check fixes for multiple aperture markers at the same s position. | 17 July 2018, 12:03:08 UTC |
| 49ff683 | Riccardo De Maria | 17 July 2018, 11:43:52 UTC | Update config.yml | 17 July 2018, 11:43:52 UTC |
| 090c4cf | amereghe | 17 July 2018, 11:42:48 UTC | restoring deleted lines (accidentally) from .gitmodules | 17 July 2018, 11:42:48 UTC |
| acf56fd | Riccardo De Maria | 17 July 2018, 11:41:15 UTC | Update config.yml | 17 July 2018, 11:41:15 UTC |
| 09f39a7 | amereghe | 17 July 2018, 11:36:08 UTC | bug fix in online aperture checking when dealing with multiple aperture markers at the same s-location The bug was simply a missing 'save' of particle coordinates after last array compression | 17 July 2018, 11:36:08 UTC |
| 242a34d | Riccardo De Maria | 17 July 2018, 10:55:53 UTC | Update config.yml | 17 July 2018, 10:55:53 UTC |
| 7c2da70 | Riccardo De Maria | 17 July 2018, 10:52:22 UTC | Update config.yml | 17 July 2018, 10:52:22 UTC |
| ee58827 | Riccardo De Maria | 17 July 2018, 10:32:08 UTC | Update config.yml | 17 July 2018, 10:32:08 UTC |
| 6300a01 | Riccardo De Maria | 17 July 2018, 10:04:11 UTC | Update config.yml | 17 July 2018, 10:04:11 UTC |
| 30953f7 | Riccardo De Maria | 16 July 2018, 21:11:43 UTC | Update config.yml | 16 July 2018, 21:11:43 UTC |
| b805c62 | Riccardo De Maria | 16 July 2018, 20:59:26 UTC | Update config.yml | 16 July 2018, 20:59:26 UTC |
| 1ecdec5 | Riccardo De Maria | 16 July 2018, 20:55:49 UTC | Update config.yml | 16 July 2018, 20:55:49 UTC |
| e34ac16 | Riccardo De Maria | 16 July 2018, 20:48:02 UTC | Update config.yml | 16 July 2018, 20:48:02 UTC |
| 6fcf598 | Riccardo De Maria | 16 July 2018, 20:39:00 UTC | Update config.yml | 16 July 2018, 20:39:00 UTC |
| 6da4e8a | Riccardo De Maria | 16 July 2018, 20:31:20 UTC | Update config.yml | 16 July 2018, 20:31:20 UTC |
| fddf821 | Riccardo De Maria | 16 July 2018, 20:26:12 UTC | Update config.yml | 16 July 2018, 20:26:12 UTC |
| eb584f9 | Riccardo De Maria | 16 July 2018, 20:22:28 UTC | Update config.yml | 16 July 2018, 20:22:28 UTC |
| 7363096 | Riccardo De Maria | 16 July 2018, 20:06:43 UTC | Create config.yml | 16 July 2018, 20:06:43 UTC |
| 0a21963 | Riccardo De Maria | 16 July 2018, 19:47:22 UTC | Update .travis.yml | 16 July 2018, 19:47:22 UTC |
| 518117e | Riccardo De Maria | 16 July 2018, 19:41:15 UTC | Merge pull request #1 from rdemaria/travis-test-1 Create .travis.yml | 16 July 2018, 19:41:15 UTC |
| 92cec10 | Riccardo De Maria | 16 July 2018, 19:40:17 UTC | Create .travis.yml | 16 July 2018, 19:40:17 UTC |
| 6cff01b | Riccardo De Maria | 16 July 2018, 14:06:58 UTC | fix text | 16 July 2018, 14:06:58 UTC |
| 3335254 | Riccardo De Maria | 16 July 2018, 14:03:51 UTC | fix text | 16 July 2018, 14:03:51 UTC |
| c7c9ce0 | Riccardo De Maria | 16 July 2018, 14:01:03 UTC | fix text | 16 July 2018, 14:01:03 UTC |
| 03b846f | Riccardo De Maria | 16 July 2018, 14:00:08 UTC | fix text | 16 July 2018, 14:00:08 UTC |
| 063da91 | Riccardo De Maria | 16 July 2018, 13:54:36 UTC | fix text | 16 July 2018, 13:54:36 UTC |
| f3185db | Riccardo De Maria | 16 July 2018, 13:53:58 UTC | fix text | 16 July 2018, 13:53:58 UTC |
| ae75f9d | Riccardo De Maria | 16 July 2018, 13:47:18 UTC | fix text | 16 July 2018, 13:47:18 UTC |
