17849d5 | Richard A. Kirian | 15 June 2013, 21:04:13 UTC | Fix merge conflicts | 15 June 2013, 23:22:41 UTC |
329a0d6 | Richard A. Kirian | 15 June 2013, 20:57:26 UTC | Merge branch 'developer' of github.com:antonbarty/cheetah into developer | 15 June 2013, 20:57:26 UTC |
a23f82a | Richard A. Kirian | 15 June 2013, 20:57:17 UTC | attempt to fix problems associated with missing photon energy | 15 June 2013, 20:57:17 UTC |
d9842b0 | Anton Barty | 15 June 2013, 15:03:40 UTC | Minor changes | 15 June 2013, 15:03:40 UTC |
26d9edf | Richard A. Kirian | 15 June 2013, 03:35:18 UTC | Merge branch 'developer' into correlations | 15 June 2013, 03:35:18 UTC |
39afa18 | Richard A. Kirian | 15 June 2013, 03:35:08 UTC | Sanity check wavelength | 15 June 2013, 03:35:08 UTC |
b9d5897 | Richard A. Kirian | 15 June 2013, 02:56:29 UTC | Finish fixing merge conflicts | 15 June 2013, 02:56:29 UTC |
c41d816 | Richard A. Kirian | 15 June 2013, 02:13:54 UTC | Fixed merge conflicts with developer branch | 15 June 2013, 02:13:54 UTC |
85172cc | Richard A. Kirian | 15 June 2013, 00:47:23 UTC | tool for printing all cheetah keywords | 15 June 2013, 00:47:23 UTC |
c624466 | Anton Barty | 14 June 2013, 12:04:12 UTC | hitfinder: Updates to process multiple streams in parallel (-c keyword); unfortunately -s was already taken! | 14 June 2013, 12:04:12 UTC |
6870e41 | Anton Barty | 14 June 2013, 10:34:54 UTC | Speedup: Assemble 2D images only when really needed. 1) Sum powder patterns in raw data only; assemble once right before writing to file; 2) Assemble image only for frames that will be saved. | 14 June 2013, 10:34:54 UTC |
f6eedab | Anton Barty | 14 June 2013, 08:24:48 UTC | Save full powder pattern along with gaincal and darkcal (useful to have the additional statistics, for example to identify bad pixels). | 14 June 2013, 08:24:48 UTC |
fe0fdde | Richard A. Kirian | 13 June 2013, 19:50:50 UTC | Merge branch 'testing' into correlations | 13 June 2013, 19:50:50 UTC |
c5f017a | Anton Barty | 13 June 2013, 19:28:33 UTC | Fiducial not being read meant files were overwriting each other, causing HDF5 library errors. Added a fix using frame number as the fiducial if not read from XTC. Could happen to the timestamp as well. | 13 June 2013, 19:28:33 UTC |
8a60c73 | Richard A. Kirian | 13 June 2013, 16:43:05 UTC | Be more explicit about resolution limits (still chasing seg. fault) | 13 June 2013, 16:43:05 UTC |
010499d | Richard A. Kirian | 13 June 2013, 16:41:46 UTC | Create option to fix the photon energy (still chasing a seg. fault) | 13 June 2013, 16:41:46 UTC |
42aa8ad | Richard A. Kirian | 13 June 2013, 16:34:05 UTC | Small change in output text (chasing seg. fault) | 13 June 2013, 16:34:05 UTC |
74578bd | Haiguang Liu | 13 June 2013, 01:19:07 UTC | fixing fftw again | 13 June 2013, 01:19:07 UTC |
eb0c167 | Haiguang Liu | 13 June 2013, 01:14:03 UTC | fixing fftw path | 13 June 2013, 01:14:03 UTC |
6417446 | Anton Barty | 12 June 2013, 21:35:11 UTC | Added more traps for thread lockup - need to add a timeout wherever waiting for all threads to exit | 12 June 2013, 21:35:11 UTC |
49db96d | Anton Barty | 12 June 2013, 14:22:45 UTC | Moved FindFFTW.cmake to a more standard location | 12 June 2013, 14:22:45 UTC |
945361a | Anton Barty | 12 June 2013, 14:16:14 UTC | Modified FindFFTW.cmake. Set FFTW_ROOT environment variable to where this is located if it is not found by default | 12 June 2013, 14:16:14 UTC |
0a331f8 | Anton Barty | 12 June 2013, 07:54:03 UTC | Why did this end up where it did | 12 June 2013, 07:54:03 UTC |
e2ecb74 | Anton Barty | 11 June 2013, 07:54:09 UTC | Merge branch 'testing' of github.com:antonbarty/cheetah into testing | 11 June 2013, 07:54:09 UTC |
9e261ee | Anton Barty | 11 June 2013, 07:53:41 UTC | Added multiple-streams-in-parallel version of hitfinder | 11 June 2013, 07:53:41 UTC |
e62d3dc | Anton Barty | 10 June 2013, 19:02:48 UTC | Ignore .xcodeproj files. They never merge cleanly and instead corrupt. Instead try: cmake -G Xcode -DBUILD_CHEETAH_ANA_MOD:BOOL=OFF -DBUILD_PSANA:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=../install .. | 10 June 2013, 19:02:48 UTC |
52e43a5 | Anton Barty | 10 June 2013, 19:00:22 UTC | Merge branch 'correlations' of github.com:antonbarty/cheetah into correlations Conflicts: source/libcheetah/src/detectorObject.cpp source/libcheetah/src/libcheetah.cpp source/libcheetah/src/setup.cpp source/libcheetah/src/worker.cpp | 10 June 2013, 19:00:22 UTC |
40ae5c9 | Anton Barty | 10 June 2013, 18:56:39 UTC | Fixed merging conflicts | 10 June 2013, 18:56:39 UTC |
eebc632 | Anton Barty | 10 June 2013, 18:44:05 UTC | Merge branch 'developer' into correlations Conflicts: source/cheetah.xcodeproj/project.pbxproj source/cheetah.xcodeproj/project.xcworkspace/xcuserdata/barty.xcuserdatad/UserInterfaceState.xcuserstate source/libcheetah/CMakeLists.txt source/libcheetah/src/detectorObject.cpp source/libcheetah/src/libcheetah.cpp source/libcheetah/src/setup.cpp source/libcheetah/src/worker.cpp | 10 June 2013, 18:44:05 UTC |
5a69c39 | Anton Barty | 10 June 2013, 18:40:25 UTC | Speed testing changes | 10 June 2013, 18:40:25 UTC |
969c022 | Haiguang Liu | 09 June 2013, 00:09:13 UTC | adding hitfind script that process individual stream in parallel | 09 June 2013, 00:09:13 UTC |
de66af4 | Haiguang Liu | 08 June 2013, 23:55:46 UTC | adding some analysis scripts in example; enable output radial-K vector for each run | 08 June 2013, 23:55:46 UTC |
622798e | Richard A. Kirian | 08 June 2013, 16:09:41 UTC | dont allocate correlation memory if not requested | 08 June 2013, 16:09:41 UTC |
520ab8d | Richard A. Kirian | 08 June 2013, 12:58:30 UTC | update hitfinder (match to developer branch) | 08 June 2013, 12:58:30 UTC |
93d903c | Richard A. Kirian | 08 June 2013, 12:56:58 UTC | add scripts for listing cheetah config keywords | 08 June 2013, 12:56:58 UTC |
270e46e | Anton Barty | 07 June 2013, 12:30:11 UTC | Added a bunch of speed tests to worker for performance profiling | 07 June 2013, 12:30:11 UTC |
0b21303 | Anton Barty | 07 June 2013, 10:16:35 UTC | Testing | 07 June 2013, 10:16:35 UTC |
03bd0e5 | Anton Barty | 07 June 2013, 10:15:21 UTC | Speed testing | 07 June 2013, 10:15:21 UTC |
52b92b6 | Anton Barty | 07 June 2013, 10:14:10 UTC | Speed testing | 07 June 2013, 10:14:10 UTC |
955bccb | Anton Barty | 07 June 2013, 10:08:50 UTC | Added another speed test | 07 June 2013, 10:08:50 UTC |
307d160 | Anton Barty | 07 June 2013, 10:05:39 UTC | Thread management won't bomb output with too many messages | 07 June 2013, 10:05:39 UTC |
e0c051f | Anton Barty | 07 June 2013, 09:20:36 UTC | Testing | 07 June 2013, 09:20:36 UTC |
264f944 | Anton Barty | 07 June 2013, 09:14:45 UTC | Don't forget to free event data in speed tests | 07 June 2013, 09:14:45 UTC |
03bd5b5 | Anton Barty | 07 June 2013, 09:07:36 UTC | Wrong error message | 07 June 2013, 09:07:36 UTC |
1438d1b | Anton Barty | 07 June 2013, 08:53:35 UTC | Prevent thread lockup - if nothing happens for 2 minutes, keep going anyway | 07 June 2013, 08:53:35 UTC |
2254cb3 | Anton Barty | 07 June 2013, 08:29:22 UTC | Bug fix | 07 June 2013, 08:29:22 UTC |
91660e0 | Anton Barty | 07 June 2013, 08:26:14 UTC | Bug fix | 07 June 2013, 08:26:14 UTC |
05af9bb | Anton Barty | 07 June 2013, 08:23:49 UTC | Housekeeping in psana interface | 07 June 2013, 08:23:49 UTC |
75d7cbf | Anton Barty | 06 June 2013, 13:32:53 UTC | Fiddling around with cheetah_ana_mod to improve efficiency | 06 June 2013, 13:32:53 UTC |
4e74c71 | Anton Barty | 06 June 2013, 10:00:07 UTC | Minor changes to the crawler (robustness, etc) | 06 June 2013, 10:00:07 UTC |
6cb6a4f | Haiguang Liu | 04 June 2013, 01:30:23 UTC | added correlation classes, and hitfinding using radialaverage | 04 June 2013, 01:30:23 UTC |
b40c998 | Anton Barty | 02 June 2013, 16:56:19 UTC | Fixed adding to powder twice | 02 June 2013, 16:56:19 UTC |
c4aabb9 | Anton Barty | 31 May 2013, 22:25:46 UTC | Some modificaitons to the IDL viewer/crawler stuff | 31 May 2013, 22:25:46 UTC |
b27d293 | Anton Barty | 31 May 2013, 15:26:31 UTC | Updating | 31 May 2013, 15:26:31 UTC |
7c5f5ec | Anton Barty | 30 May 2013, 22:24:58 UTC | Merge branch 'anton' into testing Conflicts: idl/crawler_autorun.pro idl/crawler_hdf5.pro | 30 May 2013, 22:24:58 UTC |
3bf693a | Anton Barty | 30 May 2013, 22:22:11 UTC | Updated autorun | 30 May 2013, 22:22:11 UTC |
591f1e5 | Anton Barty | 25 May 2013, 19:03:53 UTC | Updated hdf5 crawler | 25 May 2013, 19:03:53 UTC |
c5ae1f0 | Anton Barty | 24 May 2013, 14:36:08 UTC | Updated crawler_hdf5 to take advantage of little status file now written out by Cheetah | 24 May 2013, 14:36:08 UTC |
5cf01ce | Anton Barty | 24 May 2013, 13:30:43 UTC | Merge branch 'anton' into testing | 24 May 2013, 13:30:43 UTC |
0fcd306 | Anton Barty | 24 May 2013, 13:18:49 UTC | Fixed comilation error | 24 May 2013, 13:18:49 UTC |
6c3fde5 | Anton Barty | 24 May 2013, 13:11:28 UTC | Merge branch 'developer' into anton Conflicts: source/cheetah.xcodeproj/project.pbxproj source/cheetah.xcodeproj/project.xcworkspace/xcuserdata/barty.xcuserdatad/UserInterfaceState.xcuserstate source/libcheetah/src/libcheetah.cpp source/libcheetah/src/setup.cpp source/libcheetah/src/worker.cpp | 24 May 2013, 13:11:28 UTC |
a855a67 | Anton Barty | 24 May 2013, 12:59:45 UTC | Turns out having a histogram buffer was faster after all | 24 May 2013, 12:59:45 UTC |
01c71c9 | Anton Barty | 24 May 2013, 12:50:33 UTC | Added soft link from /data/histogram to /data/data | 24 May 2013, 12:50:33 UTC |
75a388f | Anton Barty | 24 May 2013, 12:32:23 UTC | Made integration of energy spectrum optional (it takes some time) | 24 May 2013, 12:32:23 UTC |
62c83bc | Anton Barty | 24 May 2013, 12:09:11 UTC | Added a periodic status file (for crawler) | 24 May 2013, 12:09:11 UTC |
b6c3874 | Anton Barty | 24 May 2013, 11:54:32 UTC | Removed histogram buffer from histogram writing - seemed to be taking more time than it was worth | 24 May 2013, 11:54:32 UTC |
4da078c | Anton Barty | 24 May 2013, 09:16:24 UTC | Fixes to histogram statistics | 24 May 2013, 09:16:24 UTC |
8035db1 | Anton Barty | 21 May 2013, 13:24:55 UTC | Fixed normalisaiton | 21 May 2013, 13:24:55 UTC |
eceaa81 | Anton Barty | 21 May 2013, 13:07:19 UTC | Fixed some typos | 21 May 2013, 13:07:19 UTC |
2602769 | Anton Barty | 21 May 2013, 13:04:36 UTC | Added more statistical measures (from Duane) | 21 May 2013, 13:04:36 UTC |
c1bb6a9 | Anton Barty | 21 May 2013, 11:29:50 UTC | Added extra information to histogram HDF5 file | 21 May 2013, 11:29:50 UTC |
8a4fa90 | Anton Barty | 21 May 2013, 01:47:02 UTC | Commented out the spectrometer for speed | 21 May 2013, 01:47:02 UTC |
6b46a31 | Anton Barty | 21 May 2013, 01:29:26 UTC | Need to add histogram.cpp to CMakeLists file | 21 May 2013, 01:29:26 UTC |
6672ea0 | Anton Barty | 21 May 2013, 01:24:31 UTC | Remember to add to histograms | 21 May 2013, 01:24:31 UTC |
1469a75 | Anton Barty | 20 May 2013, 23:57:00 UTC | Added pixel histogramming capability | 20 May 2013, 23:57:00 UTC |
bbd0d71 | Anton Barty | 20 May 2013, 21:58:21 UTC | Updated Xcode project | 20 May 2013, 21:58:21 UTC |
7b5a808 | Anton Barty | 18 May 2013, 05:57:52 UTC | Updated crawler | 18 May 2013, 05:57:52 UTC |
9b831c3 | Anton Barty | 18 May 2013, 01:39:53 UTC | Added config file to crawler_view | 18 May 2013, 01:39:53 UTC |
a252cb2 | Anton Barty | 15 May 2013, 19:58:51 UTC | Merge branch 'developer' of github.com:antonbarty/cheetah into developer | 15 May 2013, 19:58:51 UTC |
32317ef | Anton Barty | 15 May 2013, 19:58:28 UTC | Merge branch 'testing' into developer Conflicts: source/cheetah.xcodeproj/project.xcworkspace/xcuserdata/barty.xcuserdatad/UserInterfaceState.xcuserstate | 15 May 2013, 19:58:28 UTC |
8569c4d | hantke@xray.bmc.uu.se | 07 May 2013, 08:54:35 UTC | Merge branch 'developer' of github.com:antonbarty/cheetah into developer | 07 May 2013, 08:54:35 UTC |
0c3bba9 | hantke@xray.bmc.uu.se | 07 May 2013, 08:54:15 UTC | added writing to new datasets in saveCXI | 07 May 2013, 08:54:15 UTC |
69cb2b0 | Richard A. Kirian | 07 May 2013, 04:53:43 UTC | expand peak memory (avoid potential seg. faults) | 07 May 2013, 04:53:43 UTC |
210aa9f | Richard A. Kirian | 07 May 2013, 03:41:14 UTC | remove redundant message in cheetah_ana_mod | 07 May 2013, 03:41:14 UTC |
f2c5864 | Richard A. Kirian | 07 May 2013, 01:43:50 UTC | Add peak separation filter to algorithm 3 | 07 May 2013, 01:43:50 UTC |
01a6d9d | Richard A. Kirian | 07 May 2013, 01:17:03 UTC | small fixup | 07 May 2013, 01:17:03 UTC |
7c57490 | Richard A. Kirian | 07 May 2013, 00:30:12 UTC | Merge branch 'developer' of https://github.com/antonbarty/cheetah into developer | 07 May 2013, 00:30:12 UTC |
56b919f | Richard A. Kirian | 07 May 2013, 00:30:06 UTC | separate function for removing closely spaced peaks | 07 May 2013, 00:30:06 UTC |
c255f3b | Anton Barty | 06 May 2013, 04:50:06 UTC | Added crystallographer and lithographer resolution rings | 06 May 2013, 04:50:06 UTC |
0a906ff | Anton Barty | 06 May 2013, 01:47:44 UTC | Fixed up some inconsistencies in powder pattern creation | 06 May 2013, 01:47:44 UTC |
7c7ecba | Anton Barty | 06 May 2013, 01:34:38 UTC | Added resolution rings to Cheetahview | 06 May 2013, 01:34:38 UTC |
19776f4 | Anton Barty | 05 May 2013, 18:22:08 UTC | Updates | 05 May 2013, 18:22:08 UTC |
22145c9 | Anton Barty | 05 May 2013, 18:20:39 UTC | Updates to cheetahview | 05 May 2013, 18:20:39 UTC |
83bfedc | Anton Barty | 05 May 2013, 18:18:45 UTC | Added GUI control in form of some IDL scripts that crawl the output directories and compile data for an interactive table viewer | 05 May 2013, 18:18:45 UTC |
5cef309 | Richard A. Kirian | 04 May 2013, 23:47:23 UTC | make psana the default in hitfinder (myana optional) | 04 May 2013, 23:47:23 UTC |
ba5649e | Richard A. Kirian | 04 May 2013, 05:45:52 UTC | Removed pointless goto statement | 04 May 2013, 05:45:52 UTC |
cce2922 | Anton Barty | 03 May 2013, 18:57:44 UTC | Tracking down segmentation fault - reported to be in destroyEvent() | 03 May 2013, 18:57:44 UTC |
94768a2 | hantke@xray.bmc.uu.se | 03 May 2013, 07:29:52 UTC | typo | 03 May 2013, 07:29:52 UTC |
75db08b | hantke@xray.bmc.uu.se | 03 May 2013, 07:15:31 UTC | Merge branch 'developer' of github.com:antonbarty/cheetah into developer | 03 May 2013, 07:15:31 UTC |
40b14ab | Max Hantke | 03 May 2013, 07:14:32 UTC | change position in myana where CXI files are closed | 03 May 2013, 07:14:32 UTC |