From a0e8bfde7a3a7a7f73c965386a052df26a887c58 Mon Sep 17 00:00:00 2001
From: Lukas <lukas.vanelderen@cern.ch>
Date: Tue, 31 Mar 2015 12:22:58 +0200
Subject: [PATCH] fix label for PU tracks used in digi-reco PU mixing, made
 branch with track MVA values available for PU mixing

---
 FastSimulation/Configuration/python/mixObjects_cfi.py | 2 +-
 SimGeneral/MixingModule/plugins/MixingModule.cc       | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/FastSimulation/Configuration/python/mixObjects_cfi.py b/FastSimulation/Configuration/python/mixObjects_cfi.py
index afa720ccdbd58..829f0007f122e 100644
--- a/FastSimulation/Configuration/python/mixObjects_cfi.py
+++ b/FastSimulation/Configuration/python/mixObjects_cfi.py
@@ -43,7 +43,7 @@
 
 # fastsim mixes reconstructed tracks
 mixReconstructedTracks = cms.PSet(
-    input = cms.VInputTag(cms.InputTag("generalTracks")),
+    input = cms.VInputTag(cms.InputTag("generalTracksBeforeMixing")),
     type = cms.string('RecoTrack')
     )
 
diff --git a/SimGeneral/MixingModule/plugins/MixingModule.cc b/SimGeneral/MixingModule/plugins/MixingModule.cc
index 9e8c3e2067068..0136383cc0830 100644
--- a/SimGeneral/MixingModule/plugins/MixingModule.cc
+++ b/SimGeneral/MixingModule/plugins/MixingModule.cc
@@ -33,6 +33,7 @@
 #include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
 #include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
+#include "DataFormats/Common/interface/ValueMap.h"
 
 namespace edm {
 
@@ -103,8 +104,10 @@ namespace edm {
             branchesActivate(TypeID(typeid(std::vector<reco::Track>)).friendlyClassName(),std::string(""),tag,label);
             branchesActivate(TypeID(typeid(std::vector<reco::TrackExtra>)).friendlyClassName(),std::string(""),tag,label);
             branchesActivate(TypeID(typeid(edm::OwnVector<TrackingRecHit,edm::ClonePolicy<TrackingRecHit> >)).friendlyClassName(),std::string(""),tag,label);
+	    InputTag mvatag(tag.label(),"MVAVals");
+            branchesActivate(TypeID(typeid(edm::ValueMap<float>)).friendlyClassName(),std::string(""),mvatag,label);
 	    // note: no crossing frame is foreseen to be used for this object type
-
+	    
 	    LogInfo("MixingModule") <<"Will mix "<<object<<"s with InputTag= "<<tag.encode()<<", label will be "<<label;
 	    //std::cout <<"Will mix "<<object<<"s with InputTag= "<<tag.encode()<<", label will be "<<label<<std::endl;