diff --git a/PixelJet/interface/PixelJet.h b/PixelJet/interface/PixelJet.h index f1887251..4d870010 100644 --- a/PixelJet/interface/PixelJet.h +++ b/PixelJet/interface/PixelJet.h @@ -87,7 +87,7 @@ class PixelJet{ double z() const { return z_; } - int NumTk() const { + int tkNum() const { return pixelTracksNumber_; } diff --git a/PixelJetFinder/src/PixelJetProducer.cc b/PixelJetFinder/src/PixelJetProducer.cc index c34492eb..360d2ff9 100755 --- a/PixelJetFinder/src/PixelJetProducer.cc +++ b/PixelJetFinder/src/PixelJetProducer.cc @@ -324,7 +324,7 @@ void PixelJetProducer::produce(edm::Event& e, const edm::EventSetup& es) { PJ->Close(); // If the PJ has enough tracks, save it - if ( PJ->NumTk() >= NumTk_cut_ ) { + if ( PJ->tkNum() >= NumTk_cut_ ) { // Put the PixelJet in the collection v_pj_ptr->push_back( *PJ ); } diff --git a/Scripts/PrepareArea.sh b/Scripts/PrepareArea.sh index a8ee8ccd..be7ff9aa 100755 --- a/Scripts/PrepareArea.sh +++ b/Scripts/PrepareArea.sh @@ -1,27 +1,33 @@ #!/bin/sh -echo Preparing CMSSW_1_7_0_pre11 area with files necessary to run on the ntuples +echo Preparing CMSSW_1_7_0 area with files necessary to run on the ntuples echo -scramv1 project CMSSW CMSSW_1_7_0_pre11 -mkdir CMSSW_1_7_0_pre11/src/AnalysisExamples +scramv1 project CMSSW CMSSW_1_7_0 +mkdir CMSSW_1_7_0/src/AnalysisExamples project CMSSW # Copy AnalysisObjects cvs co UserCode/DeMattia/AnalysisObjects -mv UserCode/DeMattia/AnalysisObjects CMSSW_1_7_0_pre11/src/AnalysisExamples +mv UserCode/DeMattia/AnalysisObjects CMSSW_1_7_0/src/AnalysisExamples # Copy AnalysisClasses cvs co UserCode/DeMattia/AnalysisObjects -mv UserCode/DeMattia/AnalysisObjects CMSSW_1_7_0_pre11/src/AnalysisExamples +mv UserCode/DeMattia/AnalysisObjects CMSSW_1_7_0/src/AnalysisExamples # Copy L1PixelAnalyzer cvs co UserCode/DeMattia/L1PixelAnalyzer -mv UserCode/DeMattia/AnalysisObjects CMSSW_1_7_0_pre11/src/AnalysisExamples +mv UserCode/DeMattia/AnalysisObjects CMSSW_1_7_0/src/AnalysisExamples +# Copy PixelJets +cvs co UserCode/DeMattia/PixelJet +mv UserCode/DeMattia/PixelJet CMSSW_1_7_0/src/AnalysisExamples +# Copy PixelJetFinder +cvs co UserCode/DeMattia/PixelJetFinder +mv UserCode/DeMattia/PixelJetFinder CMSSW_1_7_0/src/AnalysisExamples # Remove UserCode dir rm -r UserCode # Not sure this works, better to do it outside #echo Compiling the area -#cd CMSSW_1_7_0_pre11/src +#cd CMSSW_1_7_0/src #scramv1 b echo