diff --git a/.github/workflows/test_and_publish.yaml b/.github/workflows/test_and_publish.yaml index ebb1a2184..470895fc9 100644 --- a/.github/workflows/test_and_publish.yaml +++ b/.github/workflows/test_and_publish.yaml @@ -3,7 +3,7 @@ name: Build, Test, and Publish on: pull_request: push: - branches: [main, develop] + branches: [main, develop, feature/context] tags: ['*'] workflow_dispatch: @@ -137,4 +137,4 @@ jobs: - name: Release uses: softprops/action-gh-release@v1 if: ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }} - \ No newline at end of file + diff --git a/CMakeLists.txt b/CMakeLists.txt index 33dfd2146..53eb6aac3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ if (Katydid_USE_MANTIS) link_directories (${Mantis_LIBRARY_DIRS}) pbuilder_add_ext_libraries (${Mantis_LIBRARIES}) add_definitions (-DUSE_MANTIS) - set (Mantis_FOUND TRUE) + set_option (Mantis_FOUND TRUE) endif (Katydid_USE_MANTIS) # Boost (1.46 required for filesystem version 3) @@ -111,6 +111,7 @@ if (Katydid_USE_PYTHON) SET( Nymph_ENABLE_PYTHON ON CACHE BOOL "" FORCE) else (Katydid_USE_PYTHON) set( Nymph_ENABLE_PYTHON OFF CACHE BOOL "" FORCE) + set_option (Katydid_USE_PYTHON FALSE) endif (Katydid_USE_PYTHON) # FFTW @@ -134,6 +135,7 @@ else (FFTW_FOUND) remove_definitions(-DFFTW_FOUND) remove_definitions (-DFFTW_NTHREADS=${FFTW_NTHREADS}) set (FFTW_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/External/FFTW) + set_option (Katydid_USE_FFTW FALSE) endif (FFTW_FOUND) include_directories (${FFTW_INCLUDE_DIR}) @@ -150,6 +152,7 @@ if (HDF5_FOUND) else (HDF5_FOUND) #remove_definitions (-DHDF5_FOUND) message (STATUS "Building without HDF5") + set_option (Katydid_USE_HDF5 FALSE) endif (HDF5_FOUND) # ROOT @@ -165,6 +168,7 @@ if (ROOT_FOUND) else (ROOT_FOUND) message(STATUS "Building without ROOT") remove_definitions(-DROOT_FOUND) + set_option (Katydid_USE_ROOT FALSE) endif (ROOT_FOUND) include_directories (${ROOT_INCLUDE_DIR}) @@ -181,6 +185,7 @@ if (MATIO_FOUND) else (MATIO_FOUND) message (STATUS "Building without Matlab") remove_definitions(-DUSE_MATLAB) + set_option (Katydid_USE_MATLAB FALSE) endif (MATIO_FOUND) # GraphicsMagic & Magick++ @@ -207,6 +212,7 @@ if (DLIB_FOUND) else (DLIB_FOUND) message (STATUS "Building without DLIB") remove_definitions(-DUSE_DLIB) + set_option (Katydid_USE_DLIB FALSE) endif (DLIB_FOUND) # OpenMP diff --git a/Cicada b/Cicada index ef308e2a0..4b0122b50 160000 --- a/Cicada +++ b/Cicada @@ -1 +1 @@ -Subproject commit ef308e2a0de5805de63cf92236142dea5cc94f9b +Subproject commit 4b0122b5020112f849cca9bed51d1d077f2bfe6b diff --git a/KatydidTemplate_updated.json b/KatydidTemplate_updated.json new file mode 100644 index 000000000..06d319d4e --- /dev/null +++ b/KatydidTemplate_updated.json @@ -0,0 +1,519 @@ + { + "processor-toolbox": { + "processors": [ + { + "type": "egg-processor", + "name": "egg1" + }, + { + "type": "forward-fftw", + "name": "fft1" + }, + { + "type": "convert-to-power", + "name": "to-ps1" + }, + { + "type": "egg-processor", + "name": "egg2" + }, + { + "type": "forward-fftw", + "name": "fft2" + }, + { + "type": "convert-to-power", + "name": "to-ps2" + }, + { + "type": "data-accumulator", + "name": "acc" + }, + { + "type": "gain-variation", + "name": "gainvar" + }, + { + "type": "variable-spectrum-discriminator", + "name": "discrim" + }, + { + "type": "sequential-track-finder", + "name": "seq-tr-clust" + }, + { + "type": "overlapping-track-clustering", + "name": "otc" + }, + { + "type": "iterative-track-clustering", + "name": "itc" + }, + { + "type": "track-proc-ws", + "name": "tr-proc-ws" + }, + { + "type": "multi-peak-track-builder", + "name": "mptb" + }, + { + "type": "multi-peak-event-builder", + "name": "mpeb" + }, + { + "type": "apply-cut", + "name": "ac1b" + }, + { + "type": "apply-cut", + "name": "event-nup-cut" + }, + { + "type": "apply-cut", + "name": "event-time-cut" + }, + { + "type": "basic-root-writer", + "name": "brw" + }, + { + "type": "root-tree-writer", + "name": "trw" + }, + { + "type": "root-spectrogram-writer", + "name": "waterfall-writer" + } + ], + "connections": [ + { + "signal": "egg1:header", + "slot": "fft1:header" + }, + { + "signal": "egg1:ts", + "slot": "fft1:ts-fftw" + }, + { + "signal": "fft1:fft", + "slot": "to-ps1:fs-fftw-to-psd" + }, + { + "signal": "to-ps1:psd", + "slot": "acc:ps" + }, + { + "signal": "to-ps1:psd", + "slot": "waterfall-writer:psd" + }, + { + "signal": "egg1:egg-done", + "slot": "waterfall-writer:write-file" + }, + { + "signal": "acc:ps-finished", + "slot": "gainvar:ps-var" + }, + { + "signal": "acc:ps-finished", + "slot": "brw:psd" + }, + { + "signal": "gainvar:gain-var", + "slot": "brw:gain-var" + }, + { + "signal": "gainvar:gain-var", + "slot": "discrim:gv" + }, + { + "signal": "egg2:header", + "slot": "fft2:header" + }, + { + "signal": "egg2:ts", + "slot": "fft2:ts-fftw" + }, + { + "signal": "fft2:fft", + "slot": "to-ps2:fs-fftw-to-psd" + }, + { + "signal": "to-ps2:psd", + "slot": "discrim:ps-pre" + }, + { + "signal": "discrim:disc-1d", + "slot": "seq-tr-clust:disc-1d" + }, + { + "signal": "seq-tr-clust:seq-cand", + "slot": "otc:seq-cand" + }, + { + "signal": "otc:seq-cand", + "slot": "itc:seq-cand" + }, + { + "signal": "itc:seq-cand", + "slot": "ac1b:apply" + }, + { + "signal": "ac1b:pass", + "slot": "tr-proc-ws:seq-cand" + }, + { + "signal": "tr-proc-ws:track", + "slot": "mptb:track" + }, + { + "signal": "tr-proc-ws:track", + "slot": "trw:proc-track" + }, + { + "signal": "egg2:egg-done", + "slot": "seq-tr-clust:done" + }, + { + "signal": "seq-tr-clust:clustering-done", + "slot": "otc:do-clustering" + }, + { + "signal": "otc:clustering-done", + "slot": "itc:do-clustering" + }, + { + "signal": "itc:clustering-done", + "slot": "mptb:do-clustering" + }, + { + "signal": "mptb:mpt", + "slot": "mpeb:mpt" + }, + { + "signal": "mptb:mpt-done", + "slot": "mpeb:do-clustering" + }, + { + "signal": "mpeb:event", + "slot": "event-nup-cut:apply" + }, + { + "signal": "event-nup-cut:pass", + "slot": "event-time-cut:apply" + }, + { + "signal": "event-time-cut:pass", + "slot": "trw:mt-event" + } + ], + "run-queue": [ + "egg1", + "egg2" + ] + }, + "egg1": { + "filenames": ["/katydid/locust_mc_Seed651_Angle90.0000000_Pos0.0040000_Energy18600.000000.egg"], + "egg-reader": "egg3", + "number-of-slices": 0, + "slice-size": 8192 + }, + "fft1": { + "transform-flag": "ESTIMATE" + }, + "waterfall-writer": { + "output-file": "/katydid/output/spectrogram_output.root", + "file-flag": "recreate", + "min-time": 0.0, + "max-time": 0.2, + "min-freq": 0.0, + "max-freq": 403000000.0 + }, + "acc": { + "number-to-average": 0, + "signal-interval": 0 + }, + "gainvar": { + "normalize": false, + "min-frequency": 0, + "max-frequency": 403000000.0, + "fit-points": 50 + }, + "egg2": { + "filenames": ["/katydid/locust_mc_Seed651_Angle90.0000000_Pos0.0040000_Energy18600.000000.egg"], + "egg-reader": "egg3", + "number-of-slices": 0, + "slice-size": 8192 + }, + "fft2": { + "transform-flag": "ESTIMATE" + }, + "discrim": { + "min-frequency": 0.0, + "max-frequency": 403000000.0, + "sigma-threshold": 3.0, + "normalize": true, + "neighborhood-radius": 2 + }, + "seq-tr-clust": { + "min-frequency": 0.0, + "max-frequency": 403000000.0, + "initial-slope": 800000000, + "slope-method": "weighted-first-point-ref", + "n-slope-points": 10, + "time-gap-tolerance": 0.0001, + "frequency-acceptance": 56000, + "trimming-threshold": 6, + "min-points": 3, + "min-slope": 0 + }, + "otc": { + "max-track-width": 150000 + }, + "itc": { + "time-gap-tolerance": 0.001, + "frequency-acceptance": 100000, + "max-track-width": 100000 + }, + "tr-proc-ws": { + "min-slope": 0 + }, + "mptb": { + "sideband-time-tol": 0.001 + }, + "mpeb": { + "jump-time-tol": 0.003 + }, + "ac1b": { + "seq-line-nup-cut": { + "min-total-nup": 0, + "min-average-nup": 7, + "time-or-bin-average": "bin", + "wide-or-narrow": "wide" + } + }, + "event-nup-cut": { + "ntracks-npoints-nup-cut": { + "wide-or-narrow": "wide", + "time-or-bin-average": "bin", + "default-parameters": { + "min-total-nup": 0, + "min-average-nup": 7.454357052489394, + "min-max-nup": 0 + }, + "parameters": [ + { + "ft-npoints": 3, + "ntracks": 1, + "min-total-nup": 0, + "min-average-nup": 15.74668644848628, + "min-max-nup": 0 + }, + { + "ft-npoints": 3, + "ntracks": 2, + "min-total-nup": 0, + "min-average-nup": 14.396403491431705, + "min-max-nup": 0 + }, + { + "ft-npoints": 3, + "ntracks": 3, + "min-total-nup": 0, + "min-average-nup": 13.032932650345844, + "min-max-nup": 0 + }, + { + "ft-npoints": 3, + "ntracks": 4, + "min-total-nup": 0, + "min-average-nup": 11.651179906121854, + "min-max-nup": 0 + }, + { + "ft-npoints": 3, + "ntracks": 5, + "min-total-nup": 0, + "min-average-nup": 10.242207772240628, + "min-max-nup": 0 + }, + { + "ft-npoints": 3, + "ntracks": 6, + "min-total-nup": 0, + "min-average-nup": 8.78782196327628, + "min-max-nup": 0 + }, + { + "ft-npoints": 4, + "ntracks": 1, + "min-total-nup": 0, + "min-average-nup": 12.735418234003228, + "min-max-nup": 0 + }, + { + "ft-npoints": 4, + "ntracks": 2, + "min-total-nup": 0, + "min-average-nup": 11.681651640175646, + "min-max-nup": 0 + }, + { + "ft-npoints": 4, + "ntracks": 3, + "min-total-nup": 0, + "min-average-nup": 10.610759932504259, + "min-max-nup": 0 + }, + { + "ft-npoints": 4, + "ntracks": 4, + "min-total-nup": 0, + "min-average-nup": 9.515056968514685, + "min-max-nup": 0 + }, + { + "ft-npoints": 4, + "ntracks": 5, + "min-total-nup": 0, + "min-average-nup": 8.379691045166915, + "min-max-nup": 0 + }, + { + "ft-npoints": 5, + "ntracks": 1, + "min-total-nup": 0, + "min-average-nup": 10.869025304065605, + "min-max-nup": 0 + }, + { + "ft-npoints": 5, + "ntracks": 2, + "min-total-nup": 0, + "min-average-nup": 9.987041877860296, + "min-max-nup": 0 + }, + { + "ft-npoints": 5, + "ntracks": 3, + "min-total-nup": 0, + "min-average-nup": 9.083012737896947, + "min-max-nup": 0 + }, + { + "ft-npoints": 5, + "ntracks": 4, + "min-total-nup": 0, + "min-average-nup": 8.144983909889586, + "min-max-nup": 0 + }, + { + "ft-npoints": 6, + "ntracks": 1, + "min-total-nup": 0, + "min-average-nup": 9.831510394306793, + "min-max-nup": 0 + }, + { + "ft-npoints": 6, + "ntracks": 2, + "min-total-nup": 0, + "min-average-nup": 9.148730213081482, + "min-max-nup": 0 + }, + { + "ft-npoints": 6, + "ntracks": 3, + "min-total-nup": 0, + "min-average-nup": 8.436488780835134, + "min-max-nup": 0 + }, + { + "ft-npoints": 6, + "ntracks": 4, + "min-total-nup": 0, + "min-average-nup": 7.67794591793375, + "min-max-nup": 0 + }, + { + "ft-npoints": 7, + "ntracks": 1, + "min-total-nup": 0, + "min-average-nup": 8.893879615160312, + "min-max-nup": 0 + }, + { + "ft-npoints": 7, + "ntracks": 2, + "min-total-nup": 0, + "min-average-nup": 8.294285562892895, + "min-max-nup": 0 + }, + { + "ft-npoints": 7, + "ntracks": 3, + "min-total-nup": 0, + "min-average-nup": 7.658861173418163, + "min-max-nup": 0 + }, + { + "ft-npoints": 8, + "ntracks": 1, + "min-total-nup": 0, + "min-average-nup": 8.277213651025455, + "min-max-nup": 0 + }, + { + "ft-npoints": 8, + "ntracks": 2, + "min-total-nup": 0, + "min-average-nup": 7.722303890626092, + "min-max-nup": 0 + }, + { + "ft-npoints": 9, + "ntracks": 1, + "min-total-nup": 0, + "min-average-nup": 7.9962037692806796, + "min-max-nup": 0 + }, + { + "ft-npoints": 9, + "ntracks": 2, + "min-total-nup": 0, + "min-average-nup": 7.46339335340889, + "min-max-nup": 0 + }, + { + "ft-npoints": 10, + "ntracks": 1, + "min-total-nup": 0, + "min-average-nup": 7.725369787485035, + "min-max-nup": 0 + }, + { + "ft-npoints": 11, + "ntracks": 1, + "min-total-nup": 0, + "min-average-nup": 7.454357052489394, + "min-max-nup": 0 + } + ] + } + }, + "event-time-cut": { + "event-time-in-acq-cut": { + "min-time": 0.0005, + "max-time": 5 + } + }, + "brw": { + "output-file": "/katydid/output/basic_output.root", + "file-flag": "recreate" + }, + "trw": { + "output-file": "/katydid/output/tree_output.root", + "file-flag": "update" + } +} diff --git a/Nymph b/Nymph index 141a21e64..cab1fdc72 160000 --- a/Nymph +++ b/Nymph @@ -1 +1 @@ -Subproject commit 141a21e6453725bc65aab85274d8b7ff2688e97f +Subproject commit cab1fdc7239fbaf4f3ce6402779a1fa5bfd88549 diff --git a/README.md b/README.md index 5254d9dbd..b6a00b131 100644 --- a/README.md +++ b/README.md @@ -146,3 +146,4 @@ We suggest that you use the aptly-named git extension, git-flow, which is availa * https://github.com/nvie/gitflow Issues should be posted via [GitHub](https://github.com/project8/katydid/issues). + diff --git a/Source/Data/EventAnalysis/KTMultiTrackEventData.cc b/Source/Data/EventAnalysis/KTMultiTrackEventData.cc index bcc260514..3fcc7943d 100644 --- a/Source/Data/EventAnalysis/KTMultiTrackEventData.cc +++ b/Source/Data/EventAnalysis/KTMultiTrackEventData.cc @@ -23,6 +23,7 @@ namespace Katydid fComponent(0), fAcquisitionID(0.), fEventID(0), + fFilename(""), fTotalEventSequences(0), fStartTimeInAcq(0.), fStartTimeInRunC(0.), @@ -62,6 +63,7 @@ namespace Katydid fComponent(orig.fComponent), fAcquisitionID(orig.fAcquisitionID), fEventID(orig.fEventID), + fFilename(orig.fFilename), fTotalEventSequences(orig.fTotalEventSequences), fStartTimeInAcq(orig.fStartTimeInAcq), fStartTimeInRunC(orig.fStartTimeInRunC), @@ -113,6 +115,7 @@ namespace Katydid fAcquisitionID = rhs.fAcquisitionID; fEventID = rhs.fEventID; + fFilename = rhs.fFilename; fTotalEventSequences = rhs.fTotalEventSequences; diff --git a/Source/Data/EventAnalysis/KTMultiTrackEventData.hh b/Source/Data/EventAnalysis/KTMultiTrackEventData.hh index ea777c518..31e694dc2 100644 --- a/Source/Data/EventAnalysis/KTMultiTrackEventData.hh +++ b/Source/Data/EventAnalysis/KTMultiTrackEventData.hh @@ -36,6 +36,7 @@ namespace Katydid MEMBERVARIABLE(unsigned, Component); MEMBERVARIABLE(uint64_t, AcquisitionID); MEMBERVARIABLE(unsigned, EventID); + MEMBERVARIABLE(std::string, Filename); MEMBERVARIABLE(unsigned, TotalEventSequences); // a sequence is a collection of lines with common start and end time, TotalEventSequences should be exactly the number of scatters plus one // this group of member variables is set by ProcessTracks() diff --git a/Source/Data/EventAnalysis/KTProcessedTrackData.cc b/Source/Data/EventAnalysis/KTProcessedTrackData.cc index 0f53d56e8..c7fa7ccae 100644 --- a/Source/Data/EventAnalysis/KTProcessedTrackData.cc +++ b/Source/Data/EventAnalysis/KTProcessedTrackData.cc @@ -18,6 +18,7 @@ namespace Katydid fTrackID(0), fEventID(0), fEventSequenceID(-1), + fFilename(""), fIsCut(false), fMVAClassifier(-999.), fMainband(true), @@ -57,6 +58,7 @@ namespace Katydid fTrackID(orig.fTrackID), fEventID(orig.fEventID), fEventSequenceID(orig.fEventSequenceID), + fFilename(orig.fFilename), fIsCut(orig.fIsCut), fMVAClassifier(orig.fMVAClassifier), fMainband(orig.fMainband), @@ -99,6 +101,7 @@ namespace Katydid fTrackID = rhs.fTrackID; fEventID = rhs.fEventID; fEventSequenceID = rhs.fEventSequenceID; + fFilename = rhs.fFilename; fIsCut = rhs.fIsCut; fMVAClassifier = rhs.fMVAClassifier; fMainband = rhs.fMainband; diff --git a/Source/Data/EventAnalysis/KTProcessedTrackData.hh b/Source/Data/EventAnalysis/KTProcessedTrackData.hh index 7604966c8..2d33972b1 100644 --- a/Source/Data/EventAnalysis/KTProcessedTrackData.hh +++ b/Source/Data/EventAnalysis/KTProcessedTrackData.hh @@ -30,6 +30,7 @@ namespace Katydid MEMBERVARIABLE(unsigned, TrackID); MEMBERVARIABLE(unsigned, EventID); MEMBERVARIABLE(ssize_t, EventSequenceID); + MEMBERVARIABLE(std::string, Filename); MEMBERVARIABLE(bool, IsCut); diff --git a/Source/EventAnalysis/KTMultiPeakTrackBuilder.cc b/Source/EventAnalysis/KTMultiPeakTrackBuilder.cc index 17759129e..8eb400434 100644 --- a/Source/EventAnalysis/KTMultiPeakTrackBuilder.cc +++ b/Source/EventAnalysis/KTMultiPeakTrackBuilder.cc @@ -67,6 +67,9 @@ namespace Katydid KTProcessedTrackData& track = data->Of< KTProcessedTrackData >(); + //Adding the name of the egg file (obtained from the context) to the track + track.SetFilename(fContext->Get("Filename")().as_string()); + if (track.GetAcquisitionID() != fCurrentAcquisitionID) { KTINFO(tclog, "Incoming track has a new acquisition ID (new: " << track.GetAcquisitionID() << "; current: " << fCurrentAcquisitionID << "). Will do clustering for the current acquisition."); diff --git a/Source/IO/Conversions/KT2ROOT.cc b/Source/IO/Conversions/KT2ROOT.cc index a6f543348..7bc5eb232 100644 --- a/Source/IO/Conversions/KT2ROOT.cc +++ b/Source/IO/Conversions/KT2ROOT.cc @@ -672,6 +672,7 @@ namespace Katydid rootPTData.SetTrackID(ptData.GetTrackID()); rootPTData.SetEventID(ptData.GetEventID()); rootPTData.SetEventSequenceID(ptData.GetEventSequenceID()); + rootPTData.SetFilename(ptData.GetFilename()); rootPTData.SetIsCut(ptData.GetIsCut()); rootPTData.SetStartTimeInRunC(ptData.GetStartTimeInRunC()); rootPTData.SetStartTimeInAcq(ptData.GetStartTimeInAcq()); @@ -710,6 +711,7 @@ namespace Katydid ptData.SetTrackID(rootPTData.GetTrackID()); ptData.SetEventID(rootPTData.GetEventID()); ptData.SetEventSequenceID(rootPTData.GetEventSequenceID()); + ptData.SetFilename(rootPTData.GetFilename()); ptData.SetIsCut(rootPTData.GetIsCut()); ptData.SetStartTimeInRunC(rootPTData.GetStartTimeInRunC()); ptData.SetStartTimeInAcq(rootPTData.GetStartTimeInAcq()); @@ -763,6 +765,7 @@ namespace Katydid rootMTEData.SetComponent(mteData.GetComponent()); rootMTEData.SetAcquisitionID(mteData.GetAcquisitionID()); rootMTEData.SetEventID(mteData.GetEventID()); + rootMTEData.SetFilename(mteData.GetFilename()); rootMTEData.SetTotalEventSequences(mteData.GetTotalEventSequences()); rootMTEData.SetStartTimeInRunC(mteData.GetStartTimeInRunC()); rootMTEData.SetStartTimeInAcq(mteData.GetStartTimeInAcq()); @@ -813,6 +816,7 @@ namespace Katydid mteData.SetComponent(rootMTEData.GetComponent()); mteData.SetAcquisitionID(rootMTEData.GetAcquisitionID()); mteData.SetEventID(rootMTEData.GetEventID()); + mteData.SetFilename(rootMTEData.GetFilename()); mteData.SetTotalEventSequences(rootMTEData.GetTotalEventSequences()); mteData.SetStartTimeInRunC(rootMTEData.GetStartTimeInRunC()); mteData.SetStartTimeInAcq(rootMTEData.GetStartTimeInAcq()); diff --git a/Source/Time/KTEgg3Reader.cc b/Source/Time/KTEgg3Reader.cc index 59080316c..f29572fe2 100644 --- a/Source/Time/KTEgg3Reader.cc +++ b/Source/Time/KTEgg3Reader.cc @@ -222,6 +222,11 @@ namespace Katydid } fSliceNumber = 0; + //Setting Filename in the Header, will be added to the Context in the EggProcessor + fHeader.SetFilename(fFilenames[0].first.string()); + + //fContext->Add(“test”, scarab::param_value(5)); + // set a few values in the master slice header that don't change with each slice fMasterSliceHeader.SetSampleRate(fHeader.GetAcquisitionRate()); diff --git a/Source/Time/KTEggProcessor.cc b/Source/Time/KTEggProcessor.cc index 63a3d2ec0..09dcd8ed0 100644 --- a/Source/Time/KTEggProcessor.cc +++ b/Source/Time/KTEggProcessor.cc @@ -205,6 +205,12 @@ namespace Katydid } fHeaderSignal(headerPtr); + + // Adding the filename to the Context. Getting it from EggHeader + fContext->Add("Filename", scarab::param_value(header.GetFilename())); + KTDEBUG(egglog, "The filename " << fContext->Get("Filename")().as_string() << " has been added to the context"); + + KTINFO(egglog, "The egg file has been opened successfully and the header was parsed and processed;"); KTPROG(egglog, "Proceeding with slice processing"); diff --git a/Source/Utility/KTCutable.hh b/Source/Utility/KTCutable.hh index 10b086d94..18057ba9a 100644 --- a/Source/Utility/KTCutable.hh +++ b/Source/Utility/KTCutable.hh @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -84,7 +83,7 @@ namespace Katydid }; private: - struct RangeIteratorEqualTo : std::binary_function< XRangeIteratorType, XRangeIteratorType, bool > + struct RangeIteratorEqualTo { bool operator() (const XRangeIteratorType& lhs, const XRangeIteratorType& rhs) const { @@ -92,7 +91,7 @@ namespace Katydid } }; - struct RangeIteratorHash : std::unary_function< XRangeIteratorType, std::size_t > + struct RangeIteratorHash { std::size_t operator()(const XRangeIteratorType& it) const { diff --git a/locust_mc_Seed651_Angle90.0000000_Pos0.0040000_Energy18600.000000.egg b/locust_mc_Seed651_Angle90.0000000_Pos0.0040000_Energy18600.000000.egg new file mode 100644 index 000000000..c18ddb7dc Binary files /dev/null and b/locust_mc_Seed651_Angle90.0000000_Pos0.0040000_Energy18600.000000.egg differ diff --git a/output/basic_output.root b/output/basic_output.root new file mode 100644 index 000000000..f07db95a8 Binary files /dev/null and b/output/basic_output.root differ diff --git a/output/spectrogram_output.root b/output/spectrogram_output.root new file mode 100644 index 000000000..3aeb5d76c Binary files /dev/null and b/output/spectrogram_output.root differ diff --git a/output/tree_output.root b/output/tree_output.root new file mode 100644 index 000000000..11593653c Binary files /dev/null and b/output/tree_output.root differ