Ticket #8710 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Copy / Clone parameter map

Reported by: Ricardo Leal Owned by: Ricardo Leal
Priority: major Milestone: Release 3.1
Component: Framework Keywords:
Cc: Blocked By:
Blocking: Tester: Keith Brown

Description

In order to merge instruments a copy of pmap must be created.

The new pmap will be a copy of the old one but with the keys (componentIds) updated.

Change History

comment:1 Changed 7 years ago by Ricardo Leal

New test created: 

test_copy_from_old_pmap_to_new_pmap_with_new_component()

to test function: 

newPMap.copyFromParameterMap(oldComp.get(),newComp.get(), &oldPMap);

comment:2 Changed 7 years ago by Ricardo Leal

  • Status changed from new to inprogress

Re #8710 better printTree

Changeset: 27ae32c74e1bd83d0948f325627010525036b364

comment:3 Changed 7 years ago by Ricardo Leal

Re #8710 new function copyFromParameterMap

Changeset: f089fdc94b29954b3a44e0794c68a7f523378ce8

comment:4 Changed 7 years ago by Ricardo Leal

Re #8710 Added doc headers.

Changeset: 1ce9736b93be1a23c2f0ded50429379dca967e65

comment:5 Changed 7 years ago by Ricardo Leal

Re #8710 Solve conflicts.

Changeset: 13e014d657702cad36b454016ba5fe195a131c25

comment:6 Changed 7 years ago by Ricardo Leal

  • Status changed from inprogress to verify
  • Resolution set to fixed

comment:7 Changed 7 years ago by Keith Brown

  • Status changed from verify to verifying
  • Tester set to Keith Brown

comment:8 Changed 7 years ago by Keith Brown

  • Status changed from verifying to reopened
  • Resolution fixed deleted

Please fix these 2 windows compiler warnings if they were caused by this ticket. They appeared in a build that only had commits to this ticket, even if i can't see that you altered those files in this ticket ​http://download.mantidproject.org/jenkins/view/Wall%20Display/job/is_inc_win7_develop/3281/

Last edited 7 years ago by Keith Brown (previous) (diff)

comment:9 Changed 7 years ago by Ricardo Leal

Hi Keith,

I have checked and rechecked the commit code and don't see how my code caused these 2 warnings... True that the previous build had no warnings. I don't have a windows machine to check. Any help would be appreciated.. Thanks Ricardo

comment:10 Changed 7 years ago by Keith Brown

are you in the daily standup meeting? I'll add you on skype and we can discuss there

comment:11 Changed 7 years ago by Ricardo Leal

OK great. I'm going for lunch now. I'll add you on skype.

comment:12 Changed 7 years ago by Ricardo Leal

  • Status changed from reopened to inprogress

Re #8710 Solve warning.

Changeset: a1489c81c5d711e7efc5c4e85a11d31f9c80b4a6

comment:13 Changed 7 years ago by Ricardo Leal

  • Status changed from inprogress to verify
  • Resolution set to fixed

comment:14 Changed 7 years ago by Keith Brown

  • Status changed from verify to verifying

comment:15 Changed 7 years ago by Ricardo Leal

New function in : Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp 

copyFromParameterMap(const IComponent* oldComp, const IComponent* newComp, const ParameterMap *oldPMap)

This function is not in use yet. Just a test was written to make sure it works: Code/Mantid/Framework/Geometry/test/ParameterMapTest.h 

test_copy_from_old_pmap_to_new_pmap_with_new_component()

It copies parameters from a map indexed by old component and assigns as key the new component.

comment:16 Changed 7 years ago by Keith Brown

Test passes locally, and the buildservers also passed that test

comment:17 Changed 7 years ago by Keith Brown

  • Status changed from verifying to closed

Merged. The macro doesn't seem to be working for me.

comment:18 Changed 7 years ago by Ricardo Leal

Re #8710 Solve conflicts.

Changeset: 13e014d657702cad36b454016ba5fe195a131c25

comment:19 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​9554

Note: See TracTickets for help on using tickets.