---

yaml --- r: 69691 b: "refs/heads/CMSSW_6_2_X_SLHC" c: 74104f4 h: "refs/heads/CMSSW_6_2_X_SLHC" i: 69689: 597b9f3 69687: e7a3508
cms-sw · Jul 9, 2009 · 3672440 · 3672440
1 parent 185536d
commit 3672440
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 4bec1f03ca2f14e90d0ca17351c4d42d84ec2c82
-"refs/heads/CMSSW_6_2_X_SLHC": 61b32090501ef28cc98ced901282f26d2c87c831
+"refs/heads/CMSSW_6_2_X_SLHC": 74104f4366a670ffd85220656821c99e33eed97f
diff --git a/trunk/RecoHIMuon/HiMuTracking/src/HICTrajectoryBuilder.cc b/trunk/RecoHIMuon/HiMuTracking/src/HICTrajectoryBuilder.cc
@@ -34,8 +34,8 @@
 #include "DataFormats/TrackReco/interface/TrackBase.h"
 #include "TrackingTools/PatternTools/interface/TrajectorySmoother.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
-//#include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h"
-#include "TrackingTools/PatternTools/interface/TrajectoryStateClosestToBeamLineBuilder.h"
+#include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h"
+//#include "TrackingTools/PatternTools/interface/TrajectoryStateClosestToBeamLineBuilder.h"
 
 using namespace std;
 using namespace cms;
@@ -342,9 +342,9 @@ HICTrajectoryBuilder::seedMeasurements(const TrajectorySeed& seed) const
 
     }
 
-//    TSCBLBuilderNoMaterial tscblBuilder;
+    TSCBLBuilderNoMaterial tscblBuilder;
 
-    TrajectoryStateClosestToBeamLineBuilder tscblBuilder;
+    //TrajectoryStateClosestToBeamLineBuilder tscblBuilder;
     TrajectoryStateClosestToBeamLine tscbl = tscblBuilder(*(innertsos.freeState()),bs);
 
     if (tscbl.isValid()==false) {

diff --git a/trunk/RecoHIMuon/HiMuTracking/src/HITrackVertexMaker.cc b/trunk/RecoHIMuon/HiMuTracking/src/HITrackVertexMaker.cc
@@ -7,7 +7,7 @@
 //
 // Original Author:  Dong Ho Moon
 //         Created:  Wed May  9 06:22:36 CEST 2007
-// $Id: HITrackVertexMaker.cc,v 1.14 2009/07/03 13:08:58 kodolova Exp $
+// $Id: HITrackVertexMaker.cc,v 1.15 2009/07/06 16:08:41 kodolova Exp $
 //
 //
 
@@ -54,8 +54,8 @@
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h"
-#include "TrackingTools/PatternTools/interface/TrajectoryStateClosestToBeamLineBuilder.h"
-//#include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h"
+//#include "TrackingTools/PatternTools/interface/TrajectoryStateClosestToBeamLineBuilder.h"
+#include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h"
 #include "RecoTracker/TkNavigation/interface/SimpleNavigationSchool.h"
 #include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 #include "TrackingTools/DetLayers/interface/NavigationSchool.h"
@@ -220,8 +220,8 @@ bool HITrackVertexMaker::produceTracks(const edm::Event& e1, const edm::EventSet
   std::cout<<" After first tracker update "<<std::endl;
 #endif
 
-//   edm::Handle<RecoChargedCandidateCollection> L2mucands;
-   edm::Handle<TrackCollection> L2mucands;
+   edm::Handle<RecoChargedCandidateCollection> L2mucands;
+//   edm::Handle<TrackCollection> L2mucands;
    e1.getByLabel (L2candTag_,L2mucands);
 //   RecoChargedCandidateCollection::const_iterator L2cand1;
 //   RecoChargedCandidateCollection::const_iterator L2cand2;
@@ -558,9 +558,9 @@ bool HITrackVertexMaker::produceTracks(const edm::Event& e1, const edm::EventSet
 
 
          // CMSSW31X
-         // TSCBLBuilderNoMaterial tscblBuilder;
+          TSCBLBuilderNoMaterial tscblBuilder;
          // CMSSW22X
-         TrajectoryStateClosestToBeamLineBuilder tscblBuilder;
+         //TrajectoryStateClosestToBeamLineBuilder tscblBuilder;
          TrajectoryStateClosestToBeamLine tscbl = tscblBuilder(*(innertsos.freeState()),bs);
 
          if (tscbl.isValid()==false) {
@@ -596,7 +596,7 @@ bool HITrackVertexMaker::produceTracks(const edm::Event& e1, const edm::EventSet
     for(vector<FreeTrajectoryState*>::iterator jt = it+1; jt!= theFoundFts.end(); jt++)
     {
         vector<Trajectory> second = (*theMapFtsTraj.find(*jt)).second;
-        cout<<" Number of trajectories first "<<first.size()<<" second "<<second.size()<<endl;
+       // cout<<" Number of trajectories first "<<first.size()<<" second "<<second.size()<<endl;
 
         for(vector<Trajectory>::iterator im=second.begin();im!=second.end(); im++) {
 
@@ -608,8 +608,8 @@ bool HITrackVertexMaker::produceTracks(const edm::Event& e1, const edm::EventSet
             innertsos = im->lastMeasurement().updatedState();
           }
 
-         //TSCBLBuilderNoMaterial  tscblBuilder;
-         TrajectoryStateClosestToBeamLineBuilder tscblBuilder;
+         TSCBLBuilderNoMaterial  tscblBuilder;
+         //TrajectoryStateClosestToBeamLineBuilder tscblBuilder;
          TrajectoryStateClosestToBeamLine tscbl = tscblBuilder(*(innertsos.freeState()),bs);
 
          if (tscbl.isValid()==false) {
@@ -640,7 +640,7 @@ bool HITrackVertexMaker::produceTracks(const edm::Event& e1, const edm::EventSet
            secondTransTracks.push_back( tmpTk );
         }
         if( secondTrack.size() == 0 ) continue;
-        cout<<" Number of tracks first "<<firstTrack.size()<<" second "<<secondTrack.size()<<endl;
+        //cout<<" Number of tracks first "<<firstTrack.size()<<" second "<<secondTrack.size()<<endl;
 // Try to reconstruct vertex
 
 
@@ -681,10 +681,10 @@ bool HITrackVertexMaker::produceTracks(const edm::Event& e1, const edm::EventSet
         continue;
       } 
 
-        cout<<" Vertex is found "<<endl;
-        cout<<" Chi2 = "<<theRecoVertex.totalChiSquared()<<
-	          " r= "<<theRecoVertex.position().perp()<<
-		  " z= "<<theRecoVertex.position().z()<<endl;
+     //   cout<<" Vertex is found "<<endl;
+     //   cout<<" Chi2 = "<<theRecoVertex.totalChiSquared()<<
+     //	          " r= "<<theRecoVertex.position().perp()<<
+     //		  " z= "<<theRecoVertex.position().z()<<endl;
 
 // Additional cuts       
      if ( theRecoVertex.totalChiSquared() > 0.0002 ) {