kaliveda-dev team mailing list archive

Thread
Date
[Branch ~kaliveda-dev/kaliveda/1.9] Rev 1123: merge with IV branch

To: KaliVeda Development Team <kaliveda-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 30 Sep 2015 08:04:26 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx
Merge authors:
  boisjoli <boisjoli@ganp1043>
  Guilain Ademard (ademard)
  Mark Boisjoli <mboisjol@ccage001>
  Mark Boisjoli <mboisjol@ccage004>
  Mark Boisjoli <mboisjol@ccage008>...

------------------------------------------------------------
revno: 1123 [merge]
committer: Guilain Ademard <ademard@xxxxxxxxxxxxx>
branch nick: kaliveda
timestamp: Wed 2015-09-30 10:02:40 +0200
message:
  merge with IV branch
removed:
  KVIndra/INDRA_e503/pied_chiosi_607.dat
  KVIndra/db/KVINDRADB_e503.cpp
  KVIndra/db/KVINDRADB_e503.h
  VAMOS/reconstruction/
  VAMOS/reconstruction/VAMOSreconstructionLinkDef.h
added:
  KVIndra/INDRA_e494s/IonisationChamber_v8.cal
  KVIndra/INDRA_e494s/KVBasicVAMOSFilter.root
  KVIndra/INDRA_e494s/Si_v4.cal
  KVIndra/INDRA_e494s/grilles_VAMOS_QA.dat
  KVIndra/INDRA_e503/CsI_v3.cal
  KVIndra/INDRA_e503/DC_v2.cal
  KVIndra/INDRA_e503/IonisationChamber_v3.cal
  KVIndra/INDRA_e503/Offset_relativiste.dat
  KVIndra/INDRA_e503/Offset_relativiste_chiosi.dat
  KVIndra/INDRA_e503/Si_v3.cal
  KVIndra/INDRA_e503/Tof_corr.dat
  KVIndra/INDRA_e503/Tof_corr_code1.dat
  KVIndra/INDRA_e503/VAMOS.conf
  KVIndra/INDRA_e503/VAMOSDetectorGroups.dat
  KVIndra/INDRA_e503/VAMOScalib.list
  KVIndra/INDRA_e503/VAMOSgeometry/
  KVIndra/INDRA_e503/VAMOSgeometry/CHI.cao
  KVIndra/INDRA_e503/VAMOSgeometry/CSI.cao
  KVIndra/INDRA_e503/VAMOSgeometry/DC.cao
  KVIndra/INDRA_e503/VAMOSgeometry/SI.cao
  KVIndra/INDRA_e503/VAMOSgeometry/VAMOS.cao
  KVIndra/INDRA_e503/VAMOStransMatrixCoef.list
  KVIndra/INDRA_e503/cuts_brho_sitof_4040.root
  KVIndra/INDRA_e503/cuts_brho_sitof_4048.root
  KVIndra/INDRA_e503/cuts_brho_sitof_4840.root
  KVIndra/INDRA_e503/cuts_brho_sitof_4848.root
  KVIndra/INDRA_e503/cuts_sitof_code2.dat
  KVIndra/INDRA_e503/doublepeak_mins.dat
  KVIndra/INDRA_e503/geom_chiocsi.dat
  KVIndra/INDRA_e503/grid_Q_AQ.dat
  KVIndra/INDRA_e503/grid_Q_AQ_chiosi.dat
  KVIndra/INDRA_e503/grid_chio_si_vamos.dat
  KVIndra/INDRA_e503/grid_chio_v2.dat
  KVIndra/INDRA_e503/m_function_sitof.dat
  KVIndra/INDRA_e503/mq_function_sitof.dat
  KVIndra/INDRA_e503/pied_chiosi_607.dat
  KVIndra/INDRA_e503/straight_fct.dat
  KVIndra/INDRA_e503/straight_fct_chiosi.dat
  KVIndra/detectors/KVSi75_e494s.cpp
  KVIndra/detectors/KVSi75_e494s.h
  VAMOS/analysis/KVBasicVAMOSFilter.cpp
  VAMOS/analysis/KVBasicVAMOSFilter.h
  VAMOS/analysis/KVIVReconIdent_e503.cpp
  VAMOS/analysis/KVIVReconIdent_e503.h
  VAMOS/analysis/KVVAMOSExperimentalFilter.cpp
  VAMOS/analysis/KVVAMOSExperimentalFilter.h
  VAMOS/detectors/KVHarpeeCsI.cpp
  VAMOS/detectors/KVHarpeeCsI.h
  VAMOS/idmaps/
  VAMOS/idmaps/KVIDQAGrid.cpp
  VAMOS/idmaps/KVIDQAGrid.h
  VAMOS/idmaps/KVIDQALine.cpp
  VAMOS/idmaps/KVIDQALine.h
  VAMOS/idmaps/KVIDQAMarker.cpp
  VAMOS/idmaps/KVIDQAMarker.h
  VAMOS/idmaps/VAMOSidmapsLinkDef.h
  VAMOS/idtelescopes/KVIDHarpeeICSi.cpp
  VAMOS/idtelescopes/KVIDHarpeeICSi.h
  VAMOS/idtelescopes/KVIDHarpeeICSi_e503.cpp
  VAMOS/idtelescopes/KVIDHarpeeICSi_e503.h
  VAMOS/idtelescopes/KVIDHarpeeSiCsI.cpp
  VAMOS/idtelescopes/KVIDHarpeeSiCsI.h
  VAMOS/idtelescopes/KVIDQA.cpp
  VAMOS/idtelescopes/KVIDQA.h
  VAMOS/particles/KVChargeStateDistrib.cpp
  VAMOS/particles/KVChargeStateDistrib.h
renamed:
  KVIndra/INDRA_e494s/IonisationChamber_v3.cal => KVIndra/INDRA_e494s/IonisationChamber_v7.cal
  VAMOS/reconstruction/KVVAMOSReconTrajectory.cpp => VAMOS/analysis/KVVAMOSReconTrajectory.cpp
  VAMOS/reconstruction/KVVAMOSReconTrajectory.h => VAMOS/analysis/KVVAMOSReconTrajectory.h
  VAMOS/reconstruction/KVVAMOSTransferMatrix.cpp => VAMOS/analysis/KVVAMOSTransferMatrix.cpp
  VAMOS/reconstruction/KVVAMOSTransferMatrix.h => VAMOS/analysis/KVVAMOSTransferMatrix.h
  VAMOS/reconstruction/ReconstructionSeDv.cpp => VAMOS/analysis/ReconstructionSeDv.cpp
  VAMOS/reconstruction/ReconstructionSeDv.h => VAMOS/analysis/ReconstructionSeDv.h
  VAMOS/reconstruction/Reconstructionv.cpp => VAMOS/analysis/Reconstructionv.cpp
  VAMOS/reconstruction/Reconstructionv.h => VAMOS/analysis/Reconstructionv.h
modified:
  KVIndra/INDRA_e494s/CsICalibZ1.dat
  KVIndra/INDRA_e494s/CsICalibZ2.dat
  KVIndra/INDRA_e494s/OoODetectors.dat
  KVIndra/INDRA_e494s/Runlist.csv
  KVIndra/INDRA_e494s/SeD1_v2.cal
  KVIndra/INDRA_e494s/SeD2_v2.cal
  KVIndra/INDRA_e494s/Si_v3.cal
  KVIndra/INDRA_e494s/VAMOS.conf
  KVIndra/INDRA_e494s/VAMOScalib.list
  KVIndra/INDRA_e494s/VAMOSgeometry/CHI.cao
  KVIndra/INDRA_e494s/VAMOSgeometry/SED.cao
  KVIndra/INDRA_e494s/VAMOSgeometry/SI.cao
  KVIndra/INDRA_e494s/e494s_Volt2MeV.dat
  KVIndra/INDRA_e494s/grilles_ChIo_CsI.dat
  KVIndra/INDRA_e494s/grilles_ChIo_Si.dat
  KVIndra/INDRA_e494s/grilles_CsI_RL_e494s.dat
  KVIndra/INDRA_e494s/grilles_VAMOS_IC_Si.dat
  KVIndra/INDRA_e494s/grilles_fit_Si75_SiLi.dat
  KVIndra/INDRA_e494s/grilles_fit_SiLi_CsI.dat
  KVIndra/INDRA_e494s/grilles_fit_Si_CsI.dat
  KVIndra/INDRA_e503/CsI.cal
  KVIndra/INDRA_e503/CsICalibZ1.dat
  KVIndra/INDRA_e503/Flag_CodeVamos.dat
  KVIndra/INDRA_e503/Si.cal
  KVIndra/INDRA_e503/cuts_brho_chiosi_4040.root
  KVIndra/INDRA_e503/cuts_brho_chiosi_4048.root
  KVIndra/INDRA_e503/cuts_brho_chiosi_4840.root
  KVIndra/INDRA_e503/cuts_brho_chiosi_4848.root
  KVIndra/INDRA_e503/geom_chiosi.dat
  KVIndra/INDRA_e503/grid_si_tof_vamos.dat
  KVIndra/INDRA_e503/grid_vamos.dat
  KVIndra/INDRA_e503/m_function_chiosi.dat
  KVIndra/INDRA_e503/mq_function_chiosi.dat
  KVIndra/db/KVINDRAPulserDataTree.cpp
  KVIndra/db/KVINDRAUpDater.cpp
  KVIndra/db/KVIndradbLinkDef.h
  KVIndra/detectors/KVIndradetectorsLinkDef.h
  KVIndra/detectors/KVSilicon.h
  KVIndra/idmaps/KVIDGChIoSi_e494s.cpp
  KVIndra/idmaps/KVIDGChIoSi_e494s.h
  KVIndra/idtelescopes/KVIDSi75SiLi_e494s.cpp
  KVIndra/idtelescopes/KVIDSi75SiLi_e494s.h
  KVIndra/idtelescopes/KVIDSiCorrCsI.cpp
  KVIndra/idtelescopes/KVIDSiCorrCsI.h
  KVIndra/idtelescopes/KVIDSiLiCsI_e494s.cpp
  KVIndra/idtelescopes/KVIDSiLiCsI_e494s.h
  KVMultiDet/Makefile
  KVMultiDet/base/KVSeqCollection.cpp
  KVMultiDet/calibration/KVRecombination.cpp
  KVMultiDet/daq_cec/GTGanilData.h
  KVMultiDet/daq_cec/GTOneScaler.h
  KVMultiDet/daq_cec/KVGANILDataReader.cpp
  KVMultiDet/daq_cec/KVGANILDataReader.h
  KVMultiDet/geometry/KVGroup.cpp
  KVMultiDet/geometry/KVMultiDetArray.cpp
  KVMultiDet/geometry/KVMultiDetArray.h
  KVMultiDet/gui/KVIDGridEditor.cpp
  KVMultiDet/gui/KVIDGridEditor.h
  KVMultiDet/gui/KVIDGridManagerGUI.cpp
  KVMultiDet/gui/KVIDGridManagerGUI.h
  KVMultiDet/gui/KVLVContainer.h
  KVMultiDet/gui/KVListView.h
  KVMultiDet/gui/KVTestIDGridDialog.cpp
  KVMultiDet/identification/KVTGIDGrid.cpp
  KVMultiDet/idmaps/KVIDGraph.cpp
  KVMultiDet/idmaps/KVIDGraph.h
  KVMultiDet/idmaps/KVIDLine.h
  KVMultiDet/idmaps/KVIDZAGrid.cpp
  KVMultiDet/particles/KVParticle.cpp
  KVMultiDet/particles/KVReconstructedNucleus.cpp
  Makefile
  VAMOS/Makefile
  VAMOS/analysis/Analysisv.h
  VAMOS/analysis/Analysisv_e494s.h
  VAMOS/analysis/Analysisv_e503.cpp
  VAMOS/analysis/Analysisv_e503.h
  VAMOS/analysis/KVIVReconIdent.cpp
  VAMOS/analysis/KVIVReconIdent.h
  VAMOS/analysis/VAMOSanalysisLinkDef.h
  VAMOS/calibration/KVLightEnergyCsIVamos.cpp
  VAMOS/db/KVIVDB.cpp
  VAMOS/db/KVIVDB.h
  VAMOS/db/KVIVUpDater.cpp
  VAMOS/detectors/CsIv.cpp
  VAMOS/detectors/CsIv.h
  VAMOS/detectors/DriftChamberv.cpp
  VAMOS/detectors/IonisationChamberv.cpp
  VAMOS/detectors/IonisationChamberv.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/Sive503.cpp
  VAMOS/detectors/Sive503.h
  VAMOS/detectors/VAMOSdetectorsLinkDef.h
  VAMOS/events/KVIVReconEvent.h
  VAMOS/events/KVVAMOSReconEvent.cpp
  VAMOS/events/KVVAMOSReconEvent.h
  VAMOS/geometry/KVINDRA_VAMOS.cpp
  VAMOS/geometry/KVINDRA_VAMOS.h
  VAMOS/geometry/KVVAMOS.cpp
  VAMOS/geometry/KVVAMOS.h
  VAMOS/geometry/KVVAMOSReconGeoNavigator.cpp
  VAMOS/geometry/KVVAMOSReconGeoNavigator.h
  VAMOS/geometry/VAMOSgeometryLinkDef.h
  VAMOS/identification/CsICalib.cpp
  VAMOS/identification/CsICalib.h
  VAMOS/identification/Identificationv.cpp
  VAMOS/identification/Identificationv.h
  VAMOS/identification/KVVAMOSCodes.cpp
  VAMOS/identification/KVVAMOSCodes.h
  VAMOS/idtelescopes/KVVAMOSIDTelescope.cpp
  VAMOS/idtelescopes/KVVAMOSIDTelescope.h
  VAMOS/idtelescopes/VAMOSidtelescopesLinkDef.h
  VAMOS/particles/KVVAMOSReconNuc.cpp
  VAMOS/particles/KVVAMOSReconNuc.h
  VAMOS/particles/VAMOSparticlesLinkDef.h
  etc/kaliveda-indra.rootrc
  etc/kaliveda-indravamos.rootrc
  tools/SetUpKaliVeda.sh*
  tools/SetUpROOT.sh*
  KVIndra/INDRA_e494s/IonisationChamber_v7.cal
  VAMOS/analysis/KVVAMOSReconTrajectory.cpp
  VAMOS/analysis/KVVAMOSTransferMatrix.cpp
  VAMOS/analysis/KVVAMOSTransferMatrix.h
  VAMOS/analysis/ReconstructionSeDv.cpp
  VAMOS/analysis/Reconstructionv.cpp
  VAMOS/analysis/Reconstructionv.h


--
lp:kaliveda
https://code.launchpad.net/~kaliveda-dev/kaliveda/1.9

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.9/+edit-subscription