TEST

.gitignore

@@ -10,6 +10,14 @@ __init__.py
 *.rej
 *.orig
 
+
 # ignore files under the top level $CMSSW_BASE/src directory, but not its subdirectories
 /*
 !/*/
+
+# ignore some IDE related files
+*.xcodeproj
+.vscode
+
+#ignore mac specific file
+.DS_Store

Alignment/APEEstimation/test/plottingTools/granularity.py

@@ -35,3 +35,12 @@ def __init__(self):
 
 # this name is used by default by other plotting tools
 standardGranularity = phaseOneGranularity
+
+# Granularity for Validation plots in ApeEstimator2 part of allData.root
+validationGranularity = Granularity()
+validationGranularity.sectors["X"].append( (1,8) ) # Only X is needed here, names are not required
+
+# By default, these 8 sectors are included for the ValidationSectors granularity:
+# BpixLayer1Out, BpixLayer3In, FpixMinusLayer1, TibLayer1RphiOut, TibLayer4In, TobLayer1StereoOut, TobLayer5Out, TecPlusRing7
+# This can be changed in apeEstimator_cfg or in SectorBuilder_cff
+# For these sectors, additional hit validation plots are created

Alignment/APEEstimation/test/plottingTools/validationPlotter.py

@@ -15,6 +15,8 @@ def __init__(self):
         self.markers = {}
         self.outPath = None
         self.granularity = standardGranularity
+        self.validationGranularity = validationGranularity
+
         self.order = []
 
     def addInputFile(self, label, inFile, color=None, marker=20):
@@ -120,7 +122,7 @@ def plotHist(self, folder, name, title, hists, twoDimensional=False):
         if not twoDimensional:
             legend.Draw()
 
-        cmsText = ROOT.TLatex(0.16,0.96,title)
+        cmsText = ROOT.TLatex(0.26,0.96,title)
         cmsText.SetTextFont(42)
         cmsText.SetNDC()
         cmsText.Draw("same")
@@ -194,14 +196,36 @@ def makeTrackPlot(self,histName, twoDimensional=False):
             if self.markers[label] == 0:
                 hist.SetMarkerSize(0)
                 hist.SetLineWidth(2)
-
+            fi.Close()
             if twoDimensional:
                 self.plotHist("tracks", histName+"_"+label, label, [(hist, label),], twoDimensional=True)
             else:
                 hists.append((hist, label))
         if len(hists) > 0:
             self.plotHist("tracks", histName, histName, hists, twoDimensional=twoDimensional)
 
+    def makeHitsPlot(self, sectorNumber, histName, twoDimensional=False):
+        hists = []
+        for label in self.order:
+            fi = ROOT.TFile(self.inFiles[label], "READ")
+            sectorName = fi.Get("ApeEstimator2/Sector_{sector}/z_name".format(sector=sectorNumber)).GetTitle()
+            hist = fi.Get("ApeEstimator2/Sector_{sector}/{histName}".format(sector=sectorNumber,histName=histName))
+            hist.SetLineColor(self.colors[label])
+            hist.SetMarkerColor(self.colors[label])
+            hist.SetMarkerStyle(self.markers[label])
+            hist.SetDirectory(0)
+            fi.Close()
+            if self.markers[label] == 0:
+                hist.SetMarkerSize(0)
+                hist.SetLineWidth(2)
+
+            if twoDimensional:
+                self.plotHist("hits"+"/{}".format(sectorName), histName+"_"+label, "{}: ".format(sectorName)+histName+" "+label, [(hist, label),], twoDimensional=True)
+            else:
+                hists.append((hist, label))
+        if len(hists) > 0:
+            self.plotHist("hits"+"/{}".format(sectorName), histName, "{}: ".format(sectorName)+histName, hists, twoDimensional=twoDimensional)
+
 
 
     def draw(self):
@@ -245,7 +269,23 @@ def draw(self):
         self.makeTrackPlot("h2_hitsStripVsTheta", twoDimensional=True)
         self.makeTrackPlot("h2_ptVsTheta", twoDimensional=True)
 
-
+        rangeList = self.validationGranularity.sectors["X"]
+        for first, last in rangeList:
+            for i in range(first, last+1):
+                # Get list of plots per sector, as pixel sectors have different plots
+                # We get the list from one of the result files, the rest should have the same structure
+                directoryFile = ROOT.TFile(self.inFiles[self.order[0]], "READ")
+                directory = directoryFile.GetDirectory("ApeEstimator2/Sector_{}".format(i))
+
+                for histObject in directory.GetListOfKeys():
+                    histName = histObject.GetName()
+                    if histName.startswith("h_"): # 1D hist
+                        self.makeHitsPlot(i, histName)
+                    elif histName.startswith("h2_"):
+                        self.makeHitsPlot(i, histName, twoDimensional=True)
+
+                directoryFile.Close()
+
 
 def main():
     pass

Alignment/CocoaFit/src/Fit.cc

@@ -1210,8 +1210,9 @@ void Fit::dumpFittedValues(ALIFileOut& fileout, ALIbool printErrors, ALIbool pri
   //  const Entry* entry;
   int ii, siz;
   std::vector<OpticalObject*>::const_iterator vocite;
+  ALIstring sys = ALIstring("system");
   for (vocite = Model::OptOList().begin(); vocite != Model::OptOList().end(); ++vocite) {
-    if ((*vocite)->type() == ALIstring("system"))
+    if ((*vocite)->type() == sys)
       continue;
 
     fileout << " %%%% Optical Object: " << (*vocite)->longName() << std::endl;
@@ -1268,8 +1269,9 @@ void Fit::dumpFittedValuesInAllAncestorFrames(ALIFileOut& fileout, ALIbool print
   //---------- Iterate over OptO list
   std::vector<Entry*> entries;
   std::vector<OpticalObject*>::const_iterator vocite;
+  ALIstring sys = ALIstring("system");
   for (vocite = Model::OptOList().begin(); vocite != Model::OptOList().end(); ++vocite) {
-    if ((*vocite)->type() == ALIstring("system"))
+    if ((*vocite)->type() == sys)
       continue;
 
     fileout << " %%%% Optical Object: " << (*vocite)->longName() << std::endl;

Alignment/CocoaToDDL/src/UnitConverter.cc

@@ -2,7 +2,6 @@
 #include "Alignment/CocoaToDDL/interface/CocoaUnitsTable.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include <sstream>
-#include <strstream>
 
 /*
 UnitConverter::UnitConverter(const G4BestUnit & bu)
@@ -23,7 +22,7 @@ UnitConverter::UnitConverter(ALIdouble val, const ALIstring& category)
 UnitConverter::~UnitConverter() { delete bu_; }
 
 std::string UnitConverter::ucstring() {
-  std::ostrstream str;
+  std::ostringstream str;
 
   if (angl_) {
     str.precision(11);
@@ -42,7 +41,7 @@ std::string UnitConverter::ucstring() {
 /*
 ostream & operator<<(ostream & os, const UnitConverter & uc)
 {
-  ostrstream temp;
+  std::ostringstream temp;
   //temp << uc.bu_;
   //temp << '\0';
   //string s(temp.str());

Alignment/CocoaUtilities/src/ALIFileIn.cc

@@ -9,8 +9,7 @@
 #include "Alignment/CocoaUtilities/interface/ALIFileIn.h"
 
 #include <cstdlib>
-#include <strstream>
-//#include <strstream.h>
+#include <sstream>
 
 //#include <algo.h>
 
@@ -112,7 +111,7 @@ ALIint ALIFileIn::getWordsInLine(std::vector<ALIstring>& wordlist) {
     }
 
     //---------- Convert line read to istrstream to split it in words
-    std::istrstream istr_line(ltemp);
+    std::istringstream istr_line(ltemp);
 
     //--------- count how many words are there in ltemp (this sohuld not be needed, but sun compiler has problems) !! this has to be nvestigated...
     ALIint NoWords = 0;

Alignment/CocoaUtilities/src/ALIFileOut.cc

@@ -8,7 +8,7 @@
 #include "Alignment/CocoaUtilities/interface/ALIFileOut.h"
 
 #include <cstdlib>
-#include <strstream>
+#include <sstream>
 
 std::vector<ALIFileOut*> ALIFileOut::theInstances;
 

Alignment/CommonAlignmentProducer/interface/AlignmentTracksFromVertexCompositeCandidateSelector.h

@@ -0,0 +1,38 @@
+#ifndef Alignment_CommonAlignmentAlgorithm_AlignmentTrackFromVertexCompositeCandidateSelector_h
+#define Alignment_CommonAlignmentAlgorithm_AlignmentTrackFromVertexCompositeCandidateSelector_h
+
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "DataFormats/Candidate/interface/VertexCompositeCandidate.h"
+#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include <vector>
+
+namespace edm {
+  class Event;
+  class ParameterSet;
+}  // namespace edm
+
+class TrackingRecHit;
+
+class AlignmentTrackFromVertexCompositeCandidateSelector {
+public:
+  typedef std::vector<const reco::Track*> Tracks;
+
+  /// constructor
+  AlignmentTrackFromVertexCompositeCandidateSelector(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC);
+
+  /// destructor
+  ~AlignmentTrackFromVertexCompositeCandidateSelector();
+
+  /// select tracks
+  Tracks select(const edm::Handle<reco::TrackCollection>& tc,
+                const edm::Event& evt,
+                const edm::EventSetup& setup) const;
+
+private:
+  const edm::EDGetTokenT<reco::VertexCompositeCandidateCollection> vccToken_;
+};
+
+#endif

Alignment/CommonAlignmentProducer/plugins/AlignmentTracksFromVertexCompositeCandidateSelectorModule.cc

@@ -0,0 +1,51 @@
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
+
+//the selectores used to select the tracks
+#include "Alignment/CommonAlignmentProducer/interface/AlignmentTracksFromVertexCompositeCandidateSelector.h"
+
+// the following include is necessary to clone all track branches
+// including recoTrackExtras and TrackingRecHitsOwned.
+// if you remove it the code will compile, but the cloned
+// tracks have only the recoTracks branch!
+#include "CommonTools/RecoAlgos/interface/TrackSelector.h"
+
+struct TrackFromVertexCompositeCandidateConfigSelector {
+  typedef std::vector<const reco::Track *> container;
+  typedef container::const_iterator const_iterator;
+  typedef reco::TrackCollection collection;
+
+  TrackFromVertexCompositeCandidateConfigSelector(const edm::ParameterSet &cfg, edm::ConsumesCollector &&iC)
+      : theBaseSelector(cfg, iC) {}
+
+  const_iterator begin() const { return theSelectedTracks.begin(); }
+  const_iterator end() const { return theSelectedTracks.end(); }
+  size_t size() const { return theSelectedTracks.size(); }
+
+  void select(const edm::Handle<reco::TrackCollection> &c, const edm::Event &evt, const edm::EventSetup &setup) {
+    theSelectedTracks = theBaseSelector.select(c, evt, setup);
+  }
+
+private:
+  container theSelectedTracks;
+
+  AlignmentTrackFromVertexCompositeCandidateSelector theBaseSelector;
+};
+
+class AlignmentTrackFromVertexCompositeCandidateSelectorModule
+    : public ObjectSelector<TrackFromVertexCompositeCandidateConfigSelector> {
+public:
+  AlignmentTrackFromVertexCompositeCandidateSelectorModule(const edm::ParameterSet &ps)
+      : ObjectSelector<TrackFromVertexCompositeCandidateConfigSelector>(ps) {}
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+    edm::ParameterSetDescription desc;
+    desc.setComment("Alignment Tracks Selector from VertexCompositeCandidates");
+    desc.add<edm::InputTag>("src", edm::InputTag("generalTracks"));
+    desc.add<bool>("filter", false);
+    desc.add<edm::InputTag>("vertexCompositeCandidates", edm::InputTag("generalV0Candidates:Kshort"));
+    descriptions.addWithDefaultLabel(desc);
+  }
+};
+
+DEFINE_FWK_MODULE(AlignmentTrackFromVertexCompositeCandidateSelectorModule);

Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHGCombined_Output_cff.py

@@ -0,0 +1,12 @@
+import FWCore.ParameterSet.Config as cms
+
+OutALCARECOPromptCalibProdSiPixelAliHGComb_noDrop = cms.PSet(
+    SelectEvents = cms.untracked.PSet(
+        SelectEvents = cms.vstring('pathALCARECOPromptCalibProdSiPixelAliHGMinBias','pathALCARECOPromptCalibProdSiPixelAliHGDiMu')
+    ),
+    outputCommands = cms.untracked.vstring('keep *_SiPixelAliMillePedeFileConverterHGDimuon_*_*',
+                                           'keep *_SiPixelAliMillePedeFileConverterHG_*_*')
+)
+
+OutALCARECOPromptCalibProdSiPixelAliHGComb=OutALCARECOPromptCalibProdSiPixelAliHGComb_noDrop.clone()
+OutALCARECOPromptCalibProdSiPixelAliHGComb.outputCommands.insert(0, "drop *")