kaliveda-dev team mailing list archive

Thread
Date

[Branch ~kaliveda-dev/kaliveda/1.8] Rev 350: merge of branch lp:~kaliveda-dev/kaliveda/kvedaloss

To: KaliVeda Development Team <kaliveda-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 21 Mar 2011 10:03:31 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  John Frankland (frankland)
Related merge proposals:
  https://code.launchpad.net/~kaliveda-dev/kaliveda/kvedaloss/+merge/53265
  proposed by: John Frankland (frankland)
  review: Approve - John Frankland (frankland)
------------------------------------------------------------
revno: 350 [merge]
committer: John Frankland <frankland@xxxxxxxx>
branch nick: 1.8
timestamp: Mon 2011-03-21 10:59:25 +0100
message:
  merge of branch lp:~kaliveda-dev/kaliveda/kvedaloss
  
  implementation of new VEDALOSS class KVedaLoss
  resolved two conflicts in KVMultiDet/KVMultiDetLinkDef.h and KVMultiDet/idmaps/KVIDZAGrid.cpp
  
  corrected missing ')' in KVMultiDet/base/KVPartitionList.cpp
  
  compilation checked: OK
added:
  KVMultiDet/stopping/
  KVMultiDet/stopping/KVIonRangeTable.cpp
  KVMultiDet/stopping/KVIonRangeTable.h
  KVMultiDet/stopping/KVUnits.cpp
  KVMultiDet/stopping/KVUnits.h
  KVMultiDet/stopping/KVedaLoss.cpp
  KVMultiDet/stopping/KVedaLoss.h
  KVMultiDet/stopping/KVedaLossMaterial.cpp
  KVMultiDet/stopping/KVedaLossMaterial.h
modified:
  KVIndra/detectors/KVBIC.cpp
  KVIndra/detectors/KVBIC.h
  KVIndra/detectors/KVChIo.cpp
  KVIndra/detectors/KVChIo.h
  KVIndra/detectors/KVChIo_e475s.h
  KVIndra/detectors/KVCsI.cpp
  KVIndra/detectors/KVCsI.h
  KVIndra/detectors/KVPhoswich.cpp
  KVIndra/detectors/KVSiB.cpp
  KVIndra/detectors/KVSilicon.cpp
  KVIndra/detectors/KVSilicon.h
  KVIndra/particles/KVINDRAReconNuc.cpp
  KVMultiDet/KVMultiDetLinkDef.h
  KVMultiDet/Makefile
  KVMultiDet/base/KVPartitionList.cpp
  KVMultiDet/calibration/KVPulseHeightDefect.cpp
  KVMultiDet/calibration/KVPulseHeightDefect.h
  KVMultiDet/data/kvloss.data
  KVMultiDet/db/KVDBSystem.cpp
  KVMultiDet/detectors/KVDetector.cpp
  KVMultiDet/detectors/KVDetector.h
  KVMultiDet/detectors/KVMaterial.cpp
  KVMultiDet/detectors/KVMaterial.h
  KVMultiDet/detectors/KVTarget.cpp
  KVMultiDet/detectors/KVTarget.h
  KVMultiDet/events/KVElasticScatterEvent.cpp
  KVMultiDet/events/KVReconstructedEvent.cpp
  KVMultiDet/gui/KVDBSystemDialog.cpp
  KVMultiDet/gui/KVDBSystemDialog.h
  KVMultiDet/gui/KVDetectorBrowser.cpp
  KVMultiDet/idmaps/KVIDZAGrid.cpp
  KVMultiDet/idtelescopes/KVIDTelescope.cpp
  KVMultiDet/particles/KVReconstructedNucleus.cpp
  etc/KaliVeda.rootrc
  html/ScanClasses.cpp


--
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