← Back to team overview

kaliveda-dev team mailing list archive

[Branch ~kaliveda-dev/kaliveda/1.8] Rev 841: Merging with the branch lp:~indra-vamos/kaliveda/IV revision 425.

 

Merge authors:
  Guilain Ademard (ademard)
  Guilain Ademard (ademard)
  Guilain Ademard <ademard@ccage004>
  Guilain Ademard <ademard@ccage025>
  Guilain Ademard <ademard@ccage027>...

Related merge proposals:
  https://code.launchpad.net/~kaliveda-e494s/kaliveda/e494s_branch/+merge/138690
  proposed by: Guilain Ademard (ademard)
  review: Approve - John Frankland (frankland)
------------------------------------------------------------
revno: 841 [merge]
committer: Guilain Ademard <ademard@xxxxxxxxxxxxx>
branch nick: kaliveda
timestamp: Mon 2013-04-22 09:24:32 +0200
message:
  Merging with the branch lp:~indra-vamos/kaliveda/IV revision 425.
  - New classes in the VAMOS library, see presentation of the INDRA_VAMOS
    analysis day: http://indra.in2p3.fr/spip/IMG/pdf/ademard_j_analyse130326.pdf
  - The modification for the old classes (i.e. with name without 'KV' prefix) are
    done by Mark for the e503 experiment.
added:
  KVIndra/calibration/KVLightEnergyCsIVamos.cpp
  KVIndra/calibration/KVLightEnergyCsIVamos.h
  VAMOS/VAMOS_e503/module_map.dat
  VAMOS/analysis/KVIVReconDataAnalyser.cpp
  VAMOS/analysis/KVIVReconDataAnalyser.h
  VAMOS/calibration/
  VAMOS/calibration/KVSeDPositionCal.cpp
  VAMOS/calibration/KVSeDPositionCal.h
  VAMOS/calibration/VAMOScalibrationLinkDef.h
  VAMOS/db/
  VAMOS/db/KVIVDB.cpp
  VAMOS/db/KVIVDB.h
  VAMOS/db/VAMOSdbLinkDef.h
  VAMOS/detectors/CsIv.cpp
  VAMOS/detectors/CsIv.h
  VAMOS/detectors/DriftChamber.cpp
  VAMOS/detectors/DriftChamber.h
  VAMOS/detectors/IonisationChamber.cpp
  VAMOS/detectors/IonisationChamber.h
  VAMOS/detectors/KVDriftChamber.cpp
  VAMOS/detectors/KVDriftChamber.h
  VAMOS/detectors/KVHarpeeIC.cpp
  VAMOS/detectors/KVHarpeeIC.h
  VAMOS/detectors/KVHarpeeSi.cpp
  VAMOS/detectors/KVHarpeeSi.h
  VAMOS/detectors/KVSeD.cpp
  VAMOS/detectors/KVSeD.h
  VAMOS/detectors/KVSpectroDetector.cpp
  VAMOS/detectors/KVSpectroDetector.h
  VAMOS/detectors/KVVAMOSDetector.cpp
  VAMOS/detectors/KVVAMOSDetector.h
  VAMOS/detectors/PlaneAbsorber.cpp
  VAMOS/detectors/PlaneAbsorber.h
  VAMOS/detectors/Sive503.cpp
  VAMOS/detectors/Sive503.h
  VAMOS/events/
  VAMOS/events/KVIVReconEvent.cpp
  VAMOS/events/KVIVReconEvent.h
  VAMOS/events/VAMOSeventsLinkDef.h
  VAMOS/geometry/KVINDRA_VAMOS.cpp
  VAMOS/geometry/KVINDRA_VAMOS.h
  VAMOS/geometry/KVVAMOS.cpp
  VAMOS/geometry/KVVAMOS.h
  VAMOS/identification/CsICalib.cpp
  VAMOS/identification/CsICalib.h
  VAMOS/identification/KVVAMOSCodes.cpp
  VAMOS/identification/KVVAMOSCodes.h
  VAMOS/particles/
  VAMOS/particles/KVVAMOSReconNuc.cpp
  VAMOS/particles/KVVAMOSReconNuc.h
  VAMOS/particles/VAMOSparticlesLinkDef.h
  VAMOS/reconstruction/
  VAMOS/reconstruction/KVVAMOSReconTrajectory.cpp
  VAMOS/reconstruction/KVVAMOSReconTrajectory.h
  VAMOS/reconstruction/KVVAMOSTransferMatrix.cpp
  VAMOS/reconstruction/KVVAMOSTransferMatrix.h
  VAMOS/reconstruction/VAMOSreconstructionLinkDef.h
  html/images/kvvamosrecontrajectory_refframes.png
renamed:
  KVIndra/db/KVINDRAUpDater_e494s.cpp => VAMOS/db/KVIVUpDater.cpp
  KVIndra/db/KVINDRAUpDater_e494s.h => VAMOS/db/KVIVUpDater.h
  VAMOS/analysis/ReconstructionSeDv.cpp => VAMOS/reconstruction/ReconstructionSeDv.cpp
  VAMOS/analysis/ReconstructionSeDv.h => VAMOS/reconstruction/ReconstructionSeDv.h
  VAMOS/analysis/Reconstructionv.cpp => VAMOS/reconstruction/Reconstructionv.cpp
  VAMOS/analysis/Reconstructionv.h => VAMOS/reconstruction/Reconstructionv.h
modified:
  KVIndra/calibration/KVFunctionCal.cpp
  KVIndra/calibration/KVFunctionCal.h
  KVIndra/calibration/KVIndracalibrationLinkDef.h
  KVIndra/calibration/KVLightEnergyCsI.cpp
  KVIndra/calibration/KVLightEnergyCsIFull.cpp
  KVIndra/db/KVINDRADB_e503.cpp
  KVIndra/db/KVINDRADB_e503.h
  KVIndra/db/KVINDRAUpDater.cpp
  KVIndra/db/KVIndradbLinkDef.h
  KVIndra/detectors/KVChIo.cpp
  KVIndra/idtelescopes/KVIndraidtelescopesLinkDef.h
  KVMultiDet/daq_cec/KVACQParam.cpp
  KVMultiDet/daq_cec/KVACQParam.h
  KVMultiDet/events/KV2Body.cpp
  KVMultiDet/events/KVReconstructedEvent.h
  KVMultiDet/identification/KVSpiderIdentificator.cpp
  KVMultiDet/identification/KVZALineFinder.cpp
  VAMOS/Makefile
  VAMOS/VAMOS_e503/DriftChamberRef.cal
  VAMOS/VAMOS_e503/Si.cal
  VAMOS/VAMOS_e503/Si_CsI_zline.dat
  VAMOS/VAMOS_e503/Vamos_run_brho_angle.dat
  VAMOS/analysis/Analysisv.h
  VAMOS/analysis/Analysisv_e494s.h
  VAMOS/analysis/Analysisv_e503.cpp
  VAMOS/analysis/Analysisv_e503.h
  VAMOS/analysis/KVIVRawDataAnalyser.h
  VAMOS/analysis/KVIVRawDataReconstructor.cpp
  VAMOS/analysis/KVIVRawDataReconstructor.h
  VAMOS/analysis/KVIVReconIdent.cpp
  VAMOS/analysis/KVIVReconIdent.h
  VAMOS/analysis/KVIVSelector.cpp
  VAMOS/analysis/KVIVSelector.h
  VAMOS/analysis/VAMOSanalysisLinkDef.h
  VAMOS/base/LogFile.cpp
  VAMOS/base/LogFile.h
  VAMOS/daq_cec/Parameters.cpp
  VAMOS/detectors/DriftChamberv.cpp
  VAMOS/detectors/DriftChamberv.h
  VAMOS/detectors/IonisationChamberv.cpp
  VAMOS/detectors/IonisationChamberv.h
  VAMOS/detectors/VAMOSdetectorsLinkDef.h
  VAMOS/factory/KVIVSelectorTemplate.cpp
  VAMOS/geometry/KVFocalPlanVamos.cpp
  VAMOS/geometry/KVFocalPlanVamos.h
  VAMOS/geometry/VAMOSgeometryLinkDef.h
  VAMOS/identification/Identificationv.cpp
  VAMOS/identification/Identificationv.h
  VAMOS/identification/KVIDSiCsIVamos.cpp
  VAMOS/identification/KVIDSiCsIVamos.h
  VAMOS/identification/VAMOSidentificationLinkDef.h
  etc/KaliVeda.rootrc
  html/MyPathDefinition.cxx
  VAMOS/db/KVIVUpDater.cpp
  VAMOS/db/KVIVUpDater.h
  VAMOS/reconstruction/ReconstructionSeDv.cpp
  VAMOS/reconstruction/Reconstructionv.cpp
  VAMOS/reconstruction/Reconstructionv.h


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