53x backport version making the old TuneP run as default

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),