In order to not impose the classes developed for e494s experiment in VAMOS library, which can be different for e503, we can revert all files in the VAMOS directory except the file VAMOS/analysis/KVIVRawDataReconstructor.h . The modification of this file fixes the Bug #807444. I tested the merge with the following procedure:
- THIS branch: lp:kaliveda - OTHER branch: lp:kaliveda/e494s-dev $ bzr branch lp:kaliveda testmerge $ cd testmerge $ bzr merge lo:kaliveda/e494s-dev : : : $ $ bzr revert VAMOS/identification/Identificationv_e494s.cpp VAMOS/identification/Identificationv_e494s.h VAMOS/analysis/Analysisv.h VAMOS/analysis/Analysisv_e494s.cpp VAMOS/analysis/Analysisv_e494s.h VAMOS/analysis/Defines.h VAMOS/analysis/KVIVReconIdent.cpp VAMOS/analysis/KVIVReconIdent.h VAMOS/analysis/ReconstructionSeDv.cpp VAMOS/analysis/ReconstructionSeDv.h VAMOS/analysis/Reconstructionv.cpp VAMOS/analysis/Reconstructionv.h VAMOS/detectors/IonisationChamberv.cpp VAMOS/detectors/IonisationChamberv.h VAMOS/detectors/SeD12v.cpp VAMOS/detectors/SeD12v.h VAMOS/detectors/SeDv.cpp VAMOS/detectors/SeDv.h VAMOS/detectors/Siv.cpp VAMOS/detectors/Siv.h VAMOS/identification/VAMOSidentificationLinkDef.h $ $ bzr status -V removed: KVIndra/idtelescopes/KVIDChIoCorrCsI_e503.cpp KVIndra/idtelescopes/KVIDChIoCorrCsI_e503.h KVIndra/idtelescopes/KVIDSiCorrCsI_e503.cpp KVIndra/idtelescopes/KVIDSiCorrCsI_e503.h added: KVIndra/INDRA_e494s/ChIoPressures.dat KVIndra/INDRA_e494s/Codeurs.dat KVIndra/INDRA_e494s/DetectorThicknesses.dat KVIndra/INDRA_e494s/QDC6412V.dat KVIndra/INDRA_e494s/SeD2Ref.cal KVIndra/INDRA_e494s/Si.cal KVIndra/INDRA_e494s/brho.dat KVIndra/INDRA_e494s/e494s_Channel_Volt.dat KVIndra/INDRA_e494s/e494s_Channel_Volt_etalons.dat KVIndra/INDRA_e494s/e494s_Volt2MeV.dat KVIndra/INDRA_e494s/grilles_ChIo_CsI.dat KVIndra/INDRA_e494s/grilles_ChIo_Si.dat KVIndra/INDRA_e494s/grilles_ChIo_Si75.dat KVIndra/INDRA_e494s/grilles_CsI_RL_e494s.dat KVIndra/INDRA_e494s/grilles_Si75_SiLi.dat KVIndra/INDRA_e494s/grilles_SiLi_CsI.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/db/KVINDRAUpDater_e494s.cpp KVIndra/db/KVINDRAUpDater_e494s.h KVIndra/idmaps/KVIDGChIoSi_e494s.cpp KVIndra/idmaps/KVIDGChIoSi_e494s.h KVIndra/idtelescopes/KVIDChIoCorrCsI.cpp KVIndra/idtelescopes/KVIDChIoCorrCsI.h KVIndra/idtelescopes/KVIDChIoCorrCsI_e494s.cpp KVIndra/idtelescopes/KVIDChIoCorrCsI_e494s.h KVIndra/idtelescopes/KVIDSiCorrCsI.cpp KVIndra/idtelescopes/KVIDSiCorrCsI.h KVMultiDet/identification/KVRTGIDManager.cpp KVMultiDet/identification/KVRTGIDManager.h modified: KVIndra/INDRA_e494s/AUTOMATE_E494S_RUNS_232_AND_233.LOG* KVIndra/INDRA_e494s/AUTOMATE_E494S_RUNS_546_AND_547.LOG* KVIndra/INDRA_e494s/IonisationChamber.cal KVIndra/INDRA_e494s/Runlist.csv* KVIndra/INDRA_e494s/SeD1.cal KVIndra/INDRA_e494s/SeD12Ref.cal KVIndra/INDRA_e494s/SeD1Ref.cal KVIndra/INDRA_e494s/SeD2.cal KVIndra/INDRA_e494s/Systems.dat* KVIndra/INDRA_e494s/r_brho_In.dat* KVIndra/INDRA_e494s/r_path_In.dat* KVIndra/INDRA_e494s/r_phi_In.dat* KVIndra/INDRA_e494s/r_theta_In.dat* KVIndra/INDRA_e494s/scalersVamos.dat* KVIndra/INDRA_e503/Grid_ChioCsI_C10-17_R322-606.dat KVIndra/INDRA_e503/Grid_ChioSi_C4-9_R322-606.dat KVIndra/INDRA_e503/IDGridManager_E503_CSI_RL.dat KVIndra/db/KVIndradbLinkDef.h KVIndra/idmaps/KVIndraidmapsLinkDef.h KVIndra/idtelescopes/KVIDChIoSiCorr.cpp KVIndra/idtelescopes/KVIDChIoSiCorr.h KVIndra/idtelescopes/KVIndraidtelescopesLinkDef.h KVIndra/indra/KVINDRAe503.cpp KVIndra/indra/KVINDRAe503.h KVMultiDet/identification/KVMultiDetidentificationLinkDef.h KVMultiDet/identification/KVTGIDManager.cpp KVMultiDet/identification/KVTGIDManager.h KVMultiDet/identification/KVTGIDZ.cpp KVMultiDet/identification/KVTGIDZ.h KVMultiDet/idmaps/KVIDGridManager.cpp VAMOS/analysis/KVIVRawDataReconstructor.h etc/KaliVeda.rootrc : : There is no conflict! : : $ $ SetKaliVedaVersion testmerge $ make debug=yes $ The compiling is OK. -- https://code.launchpad.net/~kaliveda-e494s/kaliveda/e494s_branch/+merge/131967 Your team KaliVeda Development Team is requested to review the proposed merge of lp:kaliveda/e494s-dev into lp:kaliveda. _______________________________________________ Mailing list: https://launchpad.net/~kaliveda-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~kaliveda-dev More help : https://help.launchpad.net/ListHelp
