diff --git a/[refs] b/[refs]
index b0e4cf571d8aa..b720c0c2137c2 100644
--- a/[refs]
+++ b/[refs]
@@ -2,4 +2,4 @@
 "refs/heads/hi_d20131223": d7335b053d7fe03e98f9f59af6a20004362628e8
 refs/heads/gh-pages: a3d9046c56a3ca3dc64ad63f7295276c81ac876a
 "refs/heads/analysis_53X_01": 3019419e9784b2b092fc6b5c503b2e0177cbe926
-"refs/heads/CMSSW_7_0_X": 0b1b14fea02561961f53bbfd4ac8ae9c12faf4eb
+"refs/heads/CMSSW_7_0_X": 0e79b5392bb669dfae5ceb8e57ff57265d030793
diff --git a/trunk/DataFormats/MuonReco/interface/MuonCocktails.h b/trunk/DataFormats/MuonReco/interface/MuonCocktails.h
index e8be43eec51ec..0e3905a7afc8d 100644
--- a/trunk/DataFormats/MuonReco/interface/MuonCocktails.h
+++ b/trunk/DataFormats/MuonReco/interface/MuonCocktails.h
@@ -6,8 +6,8 @@
  *  Set of functions that select among the different track refits
  *  based on the fit quality, in order to achieve optimal resolution.
  *
- *  $Date: 2012/09/10 09:55:45 $
- *  $Revision: 1.7 $
+ *  $Date: 2012/09/21 13:50:05 $
+ *  $Revision: 1.8 $
  *  \author Piotr Traczyk
  */
 
@@ -22,17 +22,17 @@ namespace muon {
 					     const reco::TrackRef& tpfmsTrack,
 					     const reco::TrackRef& pickyTrack,
 					     const double ptThreshold = 200.,
-					     const double tune1 = 17.,
-					     const double tune2 = 40.,
-					     const double dptcut = 0.25);
+					     const double tune1 = 4.,
+					     const double tune2 = 6.,
+					     const double dptcut = -1);
 
   // Version for convenience. (NB: can be used with pat::Muon, even
   // with embedded tracks, equally conveniently!)
   inline reco::Muon::MuonTrackTypePair tevOptimized(const reco::Muon& muon,
 						    const double ptThreshold = 200.,
-						    const double tune1 = 17.,
-						    const double tune2 = 40.,
-						    const double dptcut = 0.25) {
+						    const double tune1 = 4.,
+						    const double tune2 = 6.,
+						    const double dptcut = -1) {
     return tevOptimized(muon.globalTrack(),
 			muon.innerTrack(),
 			muon.tpfmsTrack(),
@@ -59,9 +59,9 @@ namespace muon {
 						    const reco::TrackToTrackMap& tevMap2,
 						    const reco::TrackToTrackMap& tevMap3,
 						    const double ptThreshold = 200.,
-						    const double tune1 = 17.,
-						    const double tune2 = 40.,
-						    const double dptcut = 0.25) {
+						    const double tune1 = 4.,
+						    const double tune2 = 6.,
+						    const double dptcut = -1) {
     return tevOptimized(combinedTrack,
 			trackerTrack,
 			getTevRefitTrack(combinedTrack, tevMap2),