Skip to content

Commit

Permalink
Merge pull request #25287 from mteroerd/ape-condor
Browse files Browse the repository at this point in the history 
Added support for condor instead of LSF for APE tool
  • Loading branch information
@cmsbuild
cmsbuild committed Nov 26, 2018
2 parents d24adc7 + 927e11d commit 819a388
Show file tree
Hide file tree
Showing 31 changed files with 1,102 additions and 945 deletions.
146 changes: 73 additions & 73 deletions Alignment/APEEstimation/macros/DrawIteration.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,82 +679,82 @@ void DrawIteration::drawFinals(const std::string& xOrY){
std::vector<std::pair<TH1*, TString> >::iterator i_hist;
unsigned int iHist(1);
for(i_hist = v_hist.begin(); i_hist != v_hist.end(); ++i_hist, ++iHist){
TH1* hist((*i_hist).first);
if(iHist==1){
hist->Draw("e0");
TH1* hist((*i_hist).first);
if(iHist==1){
hist->Draw("e0");
}
else{
hist->SetLineColor(iHist);
hist->SetMarkerColor(iHist);
hist->Draw("e0same");
}
}
else{
hist->SetLineColor(iHist);
hist->SetMarkerColor(iHist);
hist->Draw("e0same");
}
}

TH1* systHist(nullptr);
if(systematics_){
const std::vector<std::string>& v_name(*i_resultHist);

bool pixel(false);
bool tob(false);
std::vector<std::string>::const_iterator i_name;
for(i_name=v_name.begin(); i_name!=v_name.end(); ++i_name){
const TString name((*i_name).c_str());
if(name.BeginsWith("Bpix") || name.BeginsWith("Fpix")){
pixel = true;
break;
}
if(name.BeginsWith("Tob")){
tob = true;
break;
}
}
if(pixel || tob)systHist = new TH1F("systematics", "sytematics", v_name.size(), 0, v_name.size());
if(pixel){
if(xOrY=="x"){
systHist->SetBinContent(1, 10.);
systHist->SetBinContent(2, 10.);
systHist->SetBinContent(3, 10.);
systHist->SetBinContent(4, 10.);
systHist->SetBinContent(5, 10.);
systHist->SetBinContent(6, 10.);
systHist->SetBinContent(7, 10.);
systHist->SetBinContent(8, 10.);
systHist->SetBinContent(9, 10.);
systHist->SetBinContent(10, 10.);
systHist->SetBinContent(13, 5.);
}
else if(xOrY=="y"){
systHist->SetBinContent(1, 15.);
systHist->SetBinContent(2, 15.);
systHist->SetBinContent(3, 15.);
systHist->SetBinContent(4, 20.);
systHist->SetBinContent(5, 15.);
systHist->SetBinContent(6, 15.);
systHist->SetBinContent(7, 15.);
systHist->SetBinContent(8, 15.);
systHist->SetBinContent(9, 15.);
systHist->SetBinContent(10, 15.);
systHist->SetBinContent(13, 5.);
}
}
if(tob){
systHist->SetBinContent(1, 15.);
systHist->SetBinContent(2, 15.);
systHist->SetBinContent(3, 10.);
systHist->SetBinContent(4, 10.);
systHist->SetBinContent(5, 10.);
systHist->SetBinContent(6, 10.);
systHist->SetBinContent(7, 15.);
systHist->SetBinContent(8, 10.);
}
const std::vector<std::string>& v_name(*i_resultHist);
bool pixel(false);
bool tob(false);
std::vector<std::string>::const_iterator i_name;
for(i_name=v_name.begin(); i_name!=v_name.end(); ++i_name){
const TString name((*i_name).c_str());
if(name.BeginsWith("Bpix") || name.BeginsWith("Fpix")){
pixel = true;
break;
}
if(name.BeginsWith("Tob")){
tob = true;
break;
}
}
if(pixel || tob)systHist = new TH1F("systematics", "sytematics", v_name.size(), 0, v_name.size());
if(pixel){
if(xOrY=="x"){
systHist->SetBinContent(1, 10.);
systHist->SetBinContent(2, 10.);
systHist->SetBinContent(3, 10.);
systHist->SetBinContent(4, 10.);
systHist->SetBinContent(5, 10.);
systHist->SetBinContent(6, 10.);
systHist->SetBinContent(7, 10.);
systHist->SetBinContent(8, 10.);
systHist->SetBinContent(9, 10.);
systHist->SetBinContent(10, 10.);
systHist->SetBinContent(13, 5.);
}
else if(xOrY=="y"){
systHist->SetBinContent(1, 15.);
systHist->SetBinContent(2, 15.);
systHist->SetBinContent(3, 15.);
systHist->SetBinContent(4, 20.);
systHist->SetBinContent(5, 15.);
systHist->SetBinContent(6, 15.);
systHist->SetBinContent(7, 15.);
systHist->SetBinContent(8, 15.);
systHist->SetBinContent(9, 15.);
systHist->SetBinContent(10, 15.);
systHist->SetBinContent(13, 5.);
}
}
if(tob){
systHist->SetBinContent(1, 15.);
systHist->SetBinContent(2, 15.);
systHist->SetBinContent(3, 10.);
systHist->SetBinContent(4, 10.);
systHist->SetBinContent(5, 10.);
systHist->SetBinContent(6, 10.);
systHist->SetBinContent(7, 15.);
systHist->SetBinContent(8, 10.);
}
}

if(systHist){
systHist->SetFillColor(1);
systHist->SetFillStyle(3004);
systHist->Draw("same");
systHist->SetFillStyle(3004);
systHist->Draw("same");
}

canvas->Modified();
canvas->Update();

Expand All @@ -766,13 +766,13 @@ void DrawIteration::drawFinals(const std::string& xOrY){
legend->SetMargin(0.30);
legend->SetBorderSize(0);

if(v_hist.size()>1){
if(v_hist.size()>0){
for(i_hist = v_hist.begin(), iHist = 1; i_hist != v_hist.end(); ++i_hist, ++iHist){
legend->AddEntry((*i_hist).first, (*i_hist).second, "lp");
}
legend->Draw("same");
legend->AddEntry((*i_hist).first, (*i_hist).second, "lp");
}
legend->Draw("same");
}

canvas->Modified();
canvas->Update();

Expand All @@ -782,7 +782,7 @@ void DrawIteration::drawFinals(const std::string& xOrY){
cmsText->SetNDC();
cmsText->Draw("same");
}

canvas->Modified();
canvas->Update();

Expand Down
2 changes: 0 additions & 2 deletions Alignment/APEEstimation/plugins/ApeEstimator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ ApeEstimator::sectorBuilder(){
unsigned int sectorCounter(0);
std::vector<edm::ParameterSet> v_sectorDef(parameterSet_.getParameter<std::vector<edm::ParameterSet> >("Sectors"));
edm::LogInfo("SectorBuilder")<<"There are "<<v_sectorDef.size()<<" Sectors definded";
std::vector<edm::ParameterSet>::const_iterator i_parSet;
for(auto const & parSet : v_sectorDef){
++sectorCounter;
const std::string& sectorName(parSet.getParameter<std::string>("name"));
Expand Down Expand Up @@ -994,7 +993,6 @@ ApeEstimator::fillTrackVariables(const reco::Track& track, const Trajectory& tra
const std::vector<TrajectoryMeasurement>& v_meas = traj.measurements();

int count2D(0); float meanPhiSensToNorm(0.F);
std::vector<TrajectoryMeasurement>::const_iterator i_meas;
for(auto const & i_meas : v_meas){
const TrajectoryMeasurement& meas = i_meas;
const TransientTrackingRecHit& hit = *meas.recHit();
Expand Down
29 changes: 0 additions & 29 deletions Alignment/APEEstimation/scripts/initialise.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,13 @@

DIRBASE="$CMSSW_BASE/src/Alignment/APEEstimation"


mkdir $CMSSW_BASE/src/Alignment/TrackerAlignment/hists/


mkdir $DIRBASE/hists/
mkdir $DIRBASE/hists/workingArea/
mkdir $DIRBASE/hists/workingArea/apeObjects/
mkdir $DIRBASE/test/batch/workingArea/
mkdir $DIRBASE/test/autoSubmitter/workingArea/
mkdir $DIRBASE/test/cfgTemplateDesign/workingArea/
mkdir $DIRBASE/test/cfgTemplateMc/workingArea/
mkdir $DIRBASE/test/cfgTemplateData/workingArea/
#mkdir $DIRBASE/test/cfgTemplateParticleGun/workingArea/



cp $DIRBASE/test/cfgTemplate/createStep2.bash $DIRBASE/test/cfgTemplateDesign/createStep2.bash
cp $DIRBASE/test/cfgTemplate/startStep1.bash $DIRBASE/test/cfgTemplateDesign/startStep1.bash
cp $DIRBASE/test/cfgTemplate/startStep2.bash $DIRBASE/test/cfgTemplateDesign/startStep2.bash


cp $DIRBASE/test/cfgTemplate/createStep2.bash $DIRBASE/test/cfgTemplateMc/createStep2.bash
cp $DIRBASE/test/cfgTemplate/startStep1.bash $DIRBASE/test/cfgTemplateMc/startStep1.bash
cp $DIRBASE/test/cfgTemplate/startStep2.bash $DIRBASE/test/cfgTemplateMc/startStep2.bash


cp $DIRBASE/test/cfgTemplate/createStep2.bash $DIRBASE/test/cfgTemplateData/createStep2.bash
cp $DIRBASE/test/cfgTemplate/startStep1.bash $DIRBASE/test/cfgTemplateData/startStep1.bash
cp $DIRBASE/test/cfgTemplate/startStep2.bash $DIRBASE/test/cfgTemplateData/startStep2.bash


#cp $DIRBASE/test/cfgTemplate/createStep2.bash $DIRBASE/test/cfgTemplateParticleGun/createStep2.bash
#cp $DIRBASE/test/cfgTemplate/startStep1.bash $DIRBASE/test/cfgTemplateParticleGun/startStep1.bash
#cp $DIRBASE/test/cfgTemplate/startStep2.bash $DIRBASE/test/cfgTemplateParticleGun/startStep2.bash



## INFO: To run TrackListGenerator on AOD, need to comment in
## /Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc
Expand Down
Loading

0 comments on commit 819a388

Please sign in to comment.