message: Delete Lines For merge Conflict
diff: @@ -507,10 +507,8 @@ void AddTask_GammaConvNeutralMesonPiPlPiMiNeutralMeson_CaloMode_pp(
  } else if(trainConfig == 407) { // EDC 13 TeV, testbeam nl
  cuts.AddCutHeavyMesonCalo("00010113","411790106f032220000","32c51070a","0103603o00000000","0153503000000000"); // INT7
  } else if(trainConfig == 408) { // EDC 13 TeV + Triggers, testbeam nl
  - cuts.AddCutHeavyMesonCalo("00010113","411790106f032220000","32c51070a","0103603o00000000","0153503000000000"); // INT7
  cuts.AddCutHeavyMesonCalo("0008e113","411790106f032220000","32c51070a","0103603o00000000","0153503000000000"); // EMC7
  cuts.AddCutHeavyMesonCalo("0008d113","411790106f032220000","32c51070a","0103603o00000000","0153503000000000"); // EMC7
  - cuts.AddCutHeavyMesonCalo("0009b113","411790106f032220000","32c51070a","0103603o00000000","0153503000000000"); // EMC7
  } else {
  Error(Form("GammaConvNeutralMeson_CaloMode_%i",trainConfig), "wrong trainConfig variable no cuts have been specified for the configuration");
  return;
  