aae9252 | Anton Barty | 14 March 2013, 20:38:15 UTC | Fixed obvious merge conflicts | 14 March 2013, 20:38:15 UTC |
4e3cd0f | Anton Barty | 14 March 2013, 12:58:11 UTC | Merge branch 'unified' of https://bitbucket.org/maxhantke/cheetah into bigfiles Conflicts: source/Makefile source/cheetah.lib/cheetahmodules.h source/cheetah.lib/libcheetah.cpp source/cheetah.lib/worker.cpp | 14 March 2013, 12:58:11 UTC |
980cee0 | Richard A. Kirian | 13 March 2013, 22:36:02 UTC | Remove old documentation | 13 March 2013, 22:36:02 UTC |
1e49769 | Richard A. Kirian | 13 March 2013, 22:05:35 UTC | Added analysis-pipeline example | 13 March 2013, 22:05:35 UTC |
1c0c090 | Richard A. Kirian | 13 March 2013, 22:04:54 UTC | Merge branch 'master' of https://github.com/antonbarty/cheetah | 13 March 2013, 22:04:54 UTC |
4bf5d25 | Anton Barty | 13 March 2013, 16:05:52 UTC | Merge branch 'rbean/spectrumbasic' of ssh://git.bitwiz.org.uk/cheetah | 13 March 2013, 16:05:52 UTC |
d810ba2 | Richard A. Kirian | 13 March 2013, 14:32:52 UTC | Remove more psana stuff | 13 March 2013, 14:32:52 UTC |
7770e86 | Richard A. Kirian | 13 March 2013, 14:27:48 UTC | Minor cleanup in build-all | 13 March 2013, 14:27:48 UTC |
3035475 | Richard A. Kirian | 13 March 2013, 14:21:31 UTC | Remove psana source. Binaries are already maintained at SLAC. And it does not build anywhere else... | 13 March 2013, 14:21:31 UTC |
d605a61 | Richard Bean | 13 March 2013, 14:20:58 UTC | modified setup.cpp and saveframe.cpp so that a calibrated energy scale from a specified file is added to the event HDF5 files. new hdf5 function to read the energy scale added to spectrum.cpp | 13 March 2013, 14:20:58 UTC |
316a125 | Richard Bean | 12 March 2013, 18:08:55 UTC | fixes to spectrum.cpp so that energy scale is correctly calculated tidied up indenting in spectrum, global, setup, libcheetah, saveFrame | 12 March 2013, 18:08:55 UTC |
1dc3435 | Richard Bean | 11 March 2013, 17:05:37 UTC | added calibration to energy scale of the integrated run spectrum based on the averagephotoneV global variable energy scale is written to integratedrunspectrum hdf5 file added variable for energy range of spectrometer to cheetahglobal.h corresponding changes in saveframe.cpp setup.cpp cheetahmodules.h | 11 March 2013, 17:05:37 UTC |
bc7c8d9 | Richard Bean | 11 March 2013, 15:46:37 UTC | fix spelling errors and integer / new line warning in setup.cpp and spectrum.cpp | 11 March 2013, 15:46:37 UTC |
3a55f5d | Richard Bean | 11 March 2013, 14:46:40 UTC | fixes to input tags for espectrum in setup.cpp, tidying in spectrum.cpp | 11 March 2013, 14:46:40 UTC |
f7ba28e | Richard Bean | 11 March 2013, 09:55:45 UTC | new function in spectrum.cpp to read in spectrm dark calibration file. call to function added to setup.cpp with corresponding chanes in cheetahGlobal.h and cheetahmodules.h | 11 March 2013, 09:55:45 UTC |
4050695 | Richard A. Kirian | 08 March 2013, 16:35:12 UTC | Merge branch 'master' of https://github.com/antonbarty/cheetah | 08 March 2013, 16:35:12 UTC |
97d460f | Richard A. Kirian | 08 March 2013, 16:31:59 UTC | Whitespace (or, check that I can modify master on Github) | 08 March 2013, 16:31:59 UTC |
24848db | Richard Bean | 08 March 2013, 14:15:26 UTC | added calculation of energy spectrum background to spectrum.cpp corresponding changes in global.h,modules.h and setup.cpp | 08 March 2013, 14:15:26 UTC |
a8ab5a7 | Anton Barty | 08 March 2013, 09:40:11 UTC | Fixed silly array bounds bug in background subtraction | 08 March 2013, 09:40:11 UTC |
501636d | Anton Barty | 07 March 2013, 20:16:10 UTC | Added ASIC buffer in subtractLocalBackground (tom's suggestion for better speed) | 07 March 2013, 20:16:10 UTC |
70169a1 | Anton Barty | 07 March 2013, 15:13:12 UTC | Merge remote-tracking branch 'origin/rbean/spectrumbasic' | 07 March 2013, 15:13:12 UTC |
5727c65 | Richard Bean | 07 March 2013, 14:31:03 UTC | makefile modified for compliation with spectrum.cpp on psana | 07 March 2013, 14:31:03 UTC |
63e0198 | Richard Bean | 07 March 2013, 14:16:25 UTC | change to spectrum.cpp integratedrun function so that spectrum hits are properly counted | 07 March 2013, 14:16:25 UTC |
0d4e412 | Richard Bean | 07 March 2013, 11:17:55 UTC | added spectrum counters to log output, removed printf statements in spectrum.cpp | 07 March 2013, 11:17:55 UTC |
abf996f | Richard Bean | 06 March 2013, 17:32:24 UTC | modified saveFrame.cpp so that spectrum camera images now labelled in hdf5 filesas /data/eSpectrumCCD, turned off hardcode pulnix flag in cheetah_ana_mod.cpp | 06 March 2013, 17:32:24 UTC |
5b0732a | Richard Bean | 06 March 2013, 16:54:12 UTC | modified cheetah_ana_mod.cpp and .h to change pulnix names to spectrumm names to avoid confusion. corresponding changes in event, global, libcheetah, cheetahmodules, setup and spectrum | 06 March 2013, 16:54:12 UTC |
9c58eb6 | Chunhong Yoon | 05 March 2013, 16:58:36 UTC | Merge branch 'master' of ssh://git.bitwiz.org.uk/cheetah | 05 March 2013, 16:58:36 UTC |
4d0593c | Chunhong Yoon | 05 March 2013, 16:58:00 UTC | modified spectra | 05 March 2013, 16:58:00 UTC |
4de6fee | Richard Bean | 05 March 2013, 16:11:19 UTC | added a calculation of the maximum peak positon of the integrated spectrum and save value tofinal spectrum HDF5 in spectrum.cpp, corresponding changes in cheetahmodules.h and saveframe.cpp | 05 March 2013, 16:11:19 UTC |
e3d824a | Anton Barty | 05 March 2013, 14:35:06 UTC | Added rick's notes | 05 March 2013, 14:35:06 UTC |
8ecdb49 | Richard Bean | 05 March 2013, 14:28:03 UTC | added espectrum-tiltangle field in to the /processing field of the HDF5, removed debug messages | 05 March 2013, 14:28:03 UTC |
4fc77e8 | Chunhong Yoon | 04 March 2013, 16:37:17 UTC | add common mode | 04 March 2013, 16:37:17 UTC |
753bd70 | Chunhong Yoon | 04 March 2013, 15:10:15 UTC | add subregion spectra | 04 March 2013, 15:10:15 UTC |
b2c651a | Chunhong Yoon | 04 March 2013, 14:21:43 UTC | add event input | 04 March 2013, 14:21:43 UTC |
efa771f | Chunhong Yoon | 04 March 2013, 13:51:52 UTC | stop overriding meanAsic | 04 March 2013, 13:51:52 UTC |
0918be3 | Chunhong Yoon | 04 March 2013, 13:44:43 UTC | combine functionality | 04 March 2013, 13:44:43 UTC |
cdd1e41 | Chunhong Yoon | 04 March 2013, 08:41:38 UTC | working with inputs | 04 March 2013, 08:41:38 UTC |
7ded3f9 | Richard Bean | 01 March 2013, 16:24:24 UTC | added saveIntegratedRunSpectrum to spectrum.cpp, corresponding changes in cheetahmodules.h added writeSimpleHDF5onedim to saveframe.cpp, corresponding changes in cheetahmodules.h added writeout of integrated energy spectra to libcheetah.cpp | 01 March 2013, 16:24:24 UTC |
41dcf91 | Richard Bean | 01 March 2013, 13:47:25 UTC | added function integrateRunSpectrum to sectrum.cpp and associated variable defintions in cheetahGlobal.h, cheetahmodules.h, setup.cpp and worker.cpp | 01 March 2013, 13:47:25 UTC |
67bbf2b | Richard Bean | 01 March 2013, 10:27:14 UTC | added nespechits in cheeahGlobal to keep count of the number of spectra collected in run | 01 March 2013, 10:27:14 UTC |
131c101 | Chunhong Yoon | 01 March 2013, 08:21:43 UTC | correctly save run number | 01 March 2013, 08:21:43 UTC |
d31f4d6 | Richard Bean | 28 February 2013, 16:51:36 UTC | alter spectrum.cpp to do the maths of the energy spectrum integration | 28 February 2013, 16:51:36 UTC |
caf382d | Richard Bean | 28 February 2013, 16:30:40 UTC | add overloaded function for calculation of integrated spectrum into sprectrum.cpp and corresponding change in cheetahmodules.h | 28 February 2013, 16:30:40 UTC |
c2b51c7 | Richard Bean | 28 February 2013, 10:57:51 UTC | added HDF5 writeout for energySpectrum data to saveFrame.cpp and added flag for if spectrum exists | 28 February 2013, 10:57:51 UTC |
4b07a65 | Richard Bean | 28 February 2013, 09:33:42 UTC | eventdata->enegrySpectrum1D now modified by spectrum.cpp | 28 February 2013, 09:33:42 UTC |
5a63bd9 | Richard Bean | 27 February 2013, 22:49:04 UTC | added integrateSpectrum function into worker.cpp | 27 February 2013, 22:49:04 UTC |
d4493ce | Richard Bean | 27 February 2013, 22:04:30 UTC | added spectrum.cpp and added integrateSpectrum to cheetahmodules.h | 27 February 2013, 22:04:30 UTC |
bbe83c8 | Richard Bean | 27 February 2013, 20:54:11 UTC | add definition of eventdata variables to libcheetah.cpp | 27 February 2013, 20:54:11 UTC |
bfaa5f6 | Richard Bean | 27 February 2013, 20:19:30 UTC | add variables to Event structure header | 27 February 2013, 20:19:30 UTC |
a9aa7b4 | Richard Bean | 27 February 2013, 14:00:06 UTC | change setup.cpp to add default values into 'global' | 27 February 2013, 14:00:06 UTC |
7bf7f03 | Richard Bean | 27 February 2013, 09:04:06 UTC | dsDFsf | 27 February 2013, 09:04:06 UTC |
d8bc3e4 | Filipe Maia | 25 February 2013, 17:09:54 UTC | Fix TAB in Makefile | 25 February 2013, 17:09:54 UTC |
7b8e8a6 | Filipe Maia | 25 February 2013, 17:03:35 UTC | Fix codepath for old HDF5 versions | 25 February 2013, 17:03:35 UTC |
e0e09cc | Filipe Maia | 25 February 2013, 00:05:47 UTC | Set CXI filename. Initial CXI run. | 25 February 2013, 00:05:47 UTC |
42c51f8 | Filipe Maia | 18 February 2013, 16:22:26 UTC | Merge branch 'clean' into unified Conflicts: source/Makefile source/cheetah.lib/cheetahEvent.h source/cheetah.lib/libcheetah.cpp source/cheetah.lib/saveFrame.cpp source/cheetah.lib/worker.cpp source/lcls/myana/main.cc source/lcls/myana/main.hh | 18 February 2013, 16:22:26 UTC |
a7dfbe1 | Filipe Maia | 17 February 2013, 18:28:19 UTC | Untrack more files | 17 February 2013, 18:28:19 UTC |
272c37a | Filipe Maia | 17 February 2013, 18:22:46 UTC | Do not keep track of myana | 17 February 2013, 18:22:46 UTC |
67148d6 | Filipe Maia | 14 February 2013, 19:47:52 UTC | Remove unnecessary changes | 14 February 2013, 19:47:52 UTC |
813d79e | Chunhong Yoon | 12 February 2013, 12:31:41 UTC | debug | 12 February 2013, 12:31:41 UTC |
23572b1 | Chunhong Yoon | 12 February 2013, 12:27:40 UTC | handle corrupt data | 12 February 2013, 12:27:40 UTC |
fa03b2f | Anton Barty | 12 February 2013, 01:30:54 UTC | Housekeeping in hitfinder.cpp | 12 February 2013, 01:30:54 UTC |
29e3aca | Anton Barty | 12 February 2013, 00:14:32 UTC | Converted hitfinderMinRes and hitfinderMaxRes to pixels (specifying in A seemed to be causing problems?). | 12 February 2013, 00:14:32 UTC |
da652bf | Anton Barty | 09 February 2013, 05:32:28 UTC | More fixing of psana silliness | 09 February 2013, 05:32:28 UTC |
b7b99e9 | Anton Barty | 08 February 2013, 20:49:25 UTC | Fixed nit picking bug in XtcProofReader and chuck_ana_mod | 08 February 2013, 20:49:25 UTC |
2a36e74 | Anton Barty | 08 February 2013, 20:16:38 UTC | Fixed bug writing log file twice with two detectors | 08 February 2013, 20:16:38 UTC |
a4aa357 | Anton Barty | 08 February 2013, 19:29:21 UTC | Merge branch 'master' of ssh://git.bitwiz.org.uk/cheetah Conflicts: source/lcls-psana/xtcProofReaderPkg/src/xtcProofReader_mod.cpp | 08 February 2013, 19:29:21 UTC |
ded2091 | Anton Barty | 08 February 2013, 19:27:35 UTC | Timeout after 10 minutes waiting for threads to exit and end of Cheetah execution - clearly something is hung so exit anyway. | 08 February 2013, 19:27:35 UTC |
5b75ca1 | Anton Barty | 08 February 2013, 19:03:06 UTC | Small stuff (whitespace, etc) | 08 February 2013, 19:03:06 UTC |
ef93c97 | Chunhong Yoon | 08 February 2013, 04:55:59 UTC | const added push again | 08 February 2013, 04:55:59 UTC |
3ff26bb | Chunhong Yoon | 08 February 2013, 04:52:57 UTC | Merge branch 'master' of ssh://git.bitwiz.org.uk/cheetah | 08 February 2013, 04:52:57 UTC |
a3f0207 | Chunhong Yoon | 08 February 2013, 04:52:35 UTC | update psana interface again | 08 February 2013, 04:52:35 UTC |
50604c9 | Anton Barty | 08 February 2013, 04:36:21 UTC | Added subdirectory name to cleaned.txt filename | 08 February 2013, 04:36:21 UTC |
9ea1803 | Chunhong Yoon | 07 February 2013, 23:07:51 UTC | remove myana dependency | 07 February 2013, 23:07:51 UTC |
c13cfd8 | Chunhong Yoon | 07 February 2013, 23:05:51 UTC | better build script | 07 February 2013, 23:05:51 UTC |
d7cd0f1 | Chunhong Yoon | 07 February 2013, 22:40:14 UTC | remove pdslib build | 07 February 2013, 22:40:14 UTC |
adfa426 | Chunhong Yoon | 07 February 2013, 22:31:27 UTC | clean up links | 07 February 2013, 22:31:27 UTC |
afc4ed5 | Chunhong Yoon | 07 February 2013, 22:07:46 UTC | update psana interface | 07 February 2013, 22:07:46 UTC |
d0f3773 | Filipe Maia | 07 February 2013, 16:50:46 UTC | Create data symlinks | 07 February 2013, 16:50:46 UTC |
1b4135c | Anton Barty | 07 February 2013, 16:19:43 UTC | myana cleanup: Removed the outdated version of myana from Git repository. It is out of date, and we no longer need it since migrating to psana. | 07 February 2013, 16:19:43 UTC |
e23e300 | Anton Barty | 07 February 2013, 16:12:09 UTC | myana cleanup: Moved lcls directory to lcls-myana for clarity | 07 February 2013, 16:12:09 UTC |
331f1e4 | Anton Barty | 07 February 2013, 15:57:27 UTC | Removed psana-examples (not needed by Cheetah, and can cause psana compilation to crash) | 07 February 2013, 15:57:27 UTC |
07f62de | Anton Barty | 07 February 2013, 01:33:43 UTC | Fixed mkdir() command (umask = 777) | 07 February 2013, 01:33:43 UTC |
cbc3027 | Anton Barty | 06 February 2013, 21:07:09 UTC | Pulnix camera: Ignore it unless we need it (waste of space in HDF5 file if we don't need the data!) | 06 February 2013, 21:07:09 UTC |
814906c | Anton Barty | 06 February 2013, 20:49:34 UTC | Fixed potential ctime race condition: ctime uses an internal buffer which may in theory clobber itself if called by two threads at once (thanks Filipe) | 06 February 2013, 20:49:34 UTC |
00ab2d6 | Anton Barty | 06 February 2013, 20:45:51 UTC | Save frames to subdirectories. This is more polite on the file system: directories with many thousands of files are slow to work with because the file system must search the entire listing to find the file of interest. Breaking the data into multiple sub-directories of (say) 1000 frames each should make it faster to retrieve individual frames for analysis. | 06 February 2013, 20:45:51 UTC |
79a05d2 | Chunhong Yoon | 05 February 2013, 13:52:50 UTC | Merge branch 'master' of ssh://git.bitwiz.org.uk/cheetah | 05 February 2013, 13:52:50 UTC |
ab39d21 | Chunhong Yoon | 05 February 2013, 13:51:53 UTC | new psana definitions | 05 February 2013, 13:51:53 UTC |
a8f8b04 | Richard A. Kirian | 31 January 2013, 22:46:13 UTC | Merge branch 'master' of ssh://git.bitwiz.org.uk/cheetah | 31 January 2013, 22:46:13 UTC |
698d8bf | Chunhong Yoon | 31 January 2013, 21:25:31 UTC | add frame heading to setup.cpp | 31 January 2013, 21:25:31 UTC |
c74f339 | Chunhong Yoon | 31 January 2013, 16:16:54 UTC | more updates | 31 January 2013, 16:16:54 UTC |
8a75171 | Chunhong Yoon | 31 January 2013, 15:43:33 UTC | print out frame number | 31 January 2013, 15:43:33 UTC |
2df3e8f | Chunhong Yoon | 31 January 2013, 15:38:40 UTC | clean up | 31 January 2013, 15:38:40 UTC |
58d8761 | Chunhong Yoon | 31 January 2013, 15:31:22 UTC | fluorescence analysis | 31 January 2013, 15:31:22 UTC |
5521d43 | Chunhong Yoon | 31 January 2013, 15:30:33 UTC | modified readme | 31 January 2013, 15:30:33 UTC |
24496af | Filipe Maia | 30 January 2013, 22:30:05 UTC | A couple more metadata and initial starting values | 30 January 2013, 22:30:05 UTC |
6579b05 | Filipe Maia | 30 January 2013, 17:32:21 UTC | Add axis and write more metadata | 30 January 2013, 17:32:21 UTC |
ec4a343 | Filipe Maia | 30 January 2013, 15:58:43 UTC | Add option to output cxi or hdf5. One cxi file per run. | 30 January 2013, 15:58:43 UTC |
01adfb7 | Richard A. Kirian | 26 January 2013, 19:31:45 UTC | allow --simple-rings arg in quickview | 26 January 2013, 19:31:45 UTC |
598f303 | Richard A. Kirian | 26 January 2013, 19:29:43 UTC | .gitignore changes | 26 January 2013, 19:29:43 UTC |
1ae2bda | Richard A. Kirian | 26 January 2013, 01:49:58 UTC | Fix bug in peakfinder 6, when eliminating nearby peaks | 26 January 2013, 01:49:58 UTC |