Merge authors: John Frankland (frankland) Related merge proposals: https://code.launchpad.net/~kaliveda-dev/kaliveda/1.8.1-bugfixes/+merge/81592 proposed by: John Frankland (frankland) review: Approve - John Frankland (frankland) ------------------------------------------------------------ revno: 489 [merge] committer: John Frankland <[email protected]> branch nick: kaliveda timestamp: Wed 2011-11-23 11:51:51 +0100 message: 1.8.1-bugfixes branch merged successfully into 1.8 conflicts in KVMultiDetArray::DetectEvent due to Eric's improvements (in 1.8 branch) and my replacement of KVUniqueNameList with a KVDetectorList for fHitGroups plus corrections while testing coherency (in 1.8.1-bugfixes), keep both. compilation tested with ROOT v5.33/01 (svn) removed: KVIndra/INDRA2ROOT/Analysis.C KVIndra/INDRA2ROOT/Analysis.h added: KVIndra/analysis/KVINDRAReconRoot.cpp KVIndra/analysis/KVINDRAReconRoot.h modified: KVIndra/INDRA_e494s/Systems.dat KVIndra/KVIndraLinkDef.h KVIndra/analysis/KVINDRADstToRootTransfert.cpp KVIndra/analysis/KVINDRADstToRootTransfert.h KVIndra/analysis/KVINDRARawDataReconstructor.cpp KVIndra/analysis/KVINDRAReconDataAnalyser.cpp KVIndra/analysis/KVINDRAReconDataAnalyser.h KVIndra/analysis/KVSelector.cpp KVIndra/analysis/KVSelector.h KVIndra/detectors/KVChIo.cpp KVIndra/detectors/KVSilicon.cpp KVIndra/events/KVINDRAReconEvent.cpp KVIndra/events/KVINDRAReconEvent.h KVIndra/idmaps/KVIDGChIoSi.cpp KVIndra/idtelescopes/KVIDChIoCsI_camp5.cpp KVIndra/idtelescopes/KVIDChIoCsI_camp5.h KVIndra/idtelescopes/KVIDChIoCsI_e475s.cpp KVIndra/idtelescopes/KVIDChIoCsI_e475s.h KVIndra/idtelescopes/KVIDChIoSi.cpp KVIndra/idtelescopes/KVIDChIoSi.h KVIndra/idtelescopes/KVIDChIoSi75_camp5.cpp KVIndra/idtelescopes/KVIDChIoSi75_camp5.h KVIndra/idtelescopes/KVIDCsI.cpp KVIndra/idtelescopes/KVIDCsI.h KVIndra/idtelescopes/KVIDSi150CsI_camp5.cpp KVIndra/idtelescopes/KVIDSi150CsI_camp5.h KVIndra/idtelescopes/KVIDSi75SiLi_camp5.cpp KVIndra/idtelescopes/KVIDSi75SiLi_camp5.h KVIndra/idtelescopes/KVIDSiCsI5.cpp KVIndra/idtelescopes/KVIDSiCsI5.h KVIndra/idtelescopes/KVIDSiCsI_e475s.cpp KVIndra/idtelescopes/KVIDSiCsI_e475s.h KVIndra/idtelescopes/KVIDSiLiCsI_camp5.cpp KVIndra/idtelescopes/KVIDSiLiCsI_camp5.h KVIndra/particles/KVINDRAReconNuc.cpp KVIndra/particles/KVINDRAReconNuc.h KVMultiDet/analysis/KVDataAnalyser.h KVMultiDet/analysis/KVRawDataAnalyser.cpp KVMultiDet/data_management/KVDataSet.cpp KVMultiDet/detectors/KVDetector.cpp KVMultiDet/detectors/KVDetector.h KVMultiDet/events/KVReconstructedEvent.cpp KVMultiDet/events/KVReconstructedEvent.h KVMultiDet/geometry/KVGroup.cpp KVMultiDet/geometry/KVGroup.h KVMultiDet/geometry/KVMultiDetArray.cpp KVMultiDet/geometry/KVMultiDetArray.h KVMultiDet/idmaps/KVIDCutLine.h KVMultiDet/idmaps/KVIDGraph.h KVMultiDet/idmaps/KVIDZAGrid.cpp KVMultiDet/idmaps/KVIDentifier.h KVMultiDet/idtelescopes/KVIDTelescope.cpp KVMultiDet/idtelescopes/KVIDTelescope.h KVMultiDet/particles/KVReconstructedNucleus.cpp KVMultiDet/particles/KVReconstructedNucleus.h KVMultiDet/vg_base/KVVGSum.cpp KVMultiDet/vg_base/KVVarGlob.h KVMultiDet/vg_shape/KVTensP.cpp KVMultiDet/vg_shape/KVTensP.h VAMOS/analysis/KVIVRawDataAnalyser.cpp etc/KaliVeda.rootrc html/ReleaseNotes_1.8.1.html
-- lp:kaliveda https://code.launchpad.net/~kaliveda-dev/kaliveda/1.8 Your team KaliVeda Development Team is subscribed to branch lp:kaliveda. To unsubscribe from this branch go to https://code.launchpad.net/~kaliveda-dev/kaliveda/1.8/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~kaliveda-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~kaliveda-dev More help : https://help.launchpad.net/ListHelp
