Updated calibration parameters of SDHCAL

[libo929]

BEGINRELEASENOTES

• The SDHCAL parameters for linear energy function and hadronic energy related parameters in PandoraPFA are updated based the new calibration for ILD_l5_o2_v02 and ILD_l5_o4_v02.

ENDRELEASENOTES

[rete]

Pinging @libo929

[rete]

Your branch seems to have conflicts. I can't merge the PR. Please pull and rebase on origin/master

[libo929]

@rete Hi, how to pull and rebase for my case ?
BTW, I tried to solve the conflicts after the pull I did. I did not see conflicts on my side.

[rete]

Normally, the following commands should work :

git checkout master
git pull
git checkout calibration_sdhcal
git rebase origin/master

[libo929]

The is what I got from the last git command:

$ git rebase origin/master First, rewinding head to replay your work on top of it... Applying: Updated calibration parameters of SDHCAL Using index info to reconstruct a base tree... M StandardConfig/production/Calibration/Calibration_ILD_l4_o2_v02.xml M StandardConfig/production/Calibration/Calibration_ILD_l5_o2_v02.xml M StandardConfig/production/Calibration/Calibration_ILD_l5_o4_v02.xml M StandardConfig/production/Calibration/Calibration_ILD_s4_o2_v02.xml M StandardConfig/production/Calibration/Calibration_ILD_s5_o2_v02.xml M StandardConfig/production/Calibration/Calibration_ILD_s5_o4_v02.xml Falling back to patching base and 3-way merge... Auto-merging StandardConfig/production/Calibration/Calibration_ILD_s5_o4_v02.xml CONFLICT (content): Merge conflict in StandardConfig/production/Calibration/Calibration_ILD_s5_o4_v02.xml Auto-merging StandardConfig/production/Calibration/Calibration_ILD_s5_o2_v02.xml CONFLICT (content): Merge conflict in StandardConfig/production/Calibration/Calibration_ILD_s5_o2_v02.xml Auto-merging StandardConfig/production/Calibration/Calibration_ILD_s4_o2_v02.xml Auto-merging StandardConfig/production/Calibration/Calibration_ILD_l5_o4_v02.xml CONFLICT (content): Merge conflict in StandardConfig/production/Calibration/Calibration_ILD_l5_o4_v02.xml Auto-merging StandardConfig/production/Calibration/Calibration_ILD_l5_o2_v02.xml Auto-merging StandardConfig/production/Calibration/Calibration_ILD_l4_o2_v02.xml CONFLICT (content): Merge conflict in StandardConfig/production/Calibration/Calibration_ILD_l4_o2_v02.xml Failed to merge in the changes. Patch failed at 0001 Updated calibration parameters of SDHCAL The copy of the patch that failed is found in: /Users/libo/workplace/ILDConfig_libo2/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort".

After that, I edited the files with conflicts, then I used "git add ." and "git commit". Is that correct ?

Finally I used "git push origin calibration_sdhcal", but nothing happens.

[rete]

No, you shouldn't do that. Do :

git checkout master
git pull
git checkout calibration_sdhcal
git rebase origin/master
# ... long error message due to conflicts ...
# ... Edit files and solve conflicts ...
git add files
git rebase --continue
git push your-fork  calibration_sdhcal -f

[libo929]

Could you please check it again ?