Merge pull request #14674 from HipPydevelopment/80X_2016Collision

HipPy update for release 81X

Alignment/HIPAlignmentAlgorithm/data/ALCARECOTkAlCosmicsCTF0T.dat_CRUZET_PromptReco

@@ -0,0 +1,6 @@
+'/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/150/00000/0AFFEA6D-ACE6-E511-BF51-02163E011944.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/275/00000/0E72E81D-23E7-E511-AAC8-02163E01367B.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/423/00000/02F2A6FB-2AE8-E511-86D1-02163E011F57.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/423/00000/28DCF21C-2BE8-E511-BB5B-02163E014736.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/535/00000/8E93575E-C6E8-E511-950D-02163E012974.root'
+'/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/536/00000/2A1C9BA9-D6E8-E511-A44D-02163E01414F.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/537/00000/08735A53-EDE8-E511-BB0F-02163E01448E.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/538/00000/F4B05967-F6E8-E511-92B4-02163E013535.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/665/00000/D2DB86EA-E1E9-E511-BC6A-02163E0141F2.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/665/00000/FEFA390B-E1E9-E511-AC60-02163E0129DC.root'
+'/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/667/00000/BA47626E-1AEA-E511-A547-02163E014724.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/681/00000/82BDEAC5-55EB-E511-8BAF-02163E013432.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/266/681/00000/A4169608-56EB-E511-92EF-02163E013825.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/593/00000/D2EAE44B-3DF2-E511-9CA0-02163E014431.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/595/00000/A41AF153-63F2-E511-BE07-02163E011DE0.root'
+'/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/597/00000/A823B29C-65F2-E511-BB9E-02163E0137D8.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/598/00000/2488E86A-67F2-E511-AC4C-02163E013881.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/594/00000/A40C6319-6CF2-E511-A77E-02163E01338D.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/599/00000/105AA4C1-6EF2-E511-8358-02163E0119A7.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/600/00000/B455AF0F-71F2-E511-BD01-02163E013917.root'
+'/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/602/00000/602DE053-73F2-E511-B573-02163E0120E1.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/782/00000/B8366B95-76F3-E511-A88E-02163E013422.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/878/00000/1E4AE364-79F3-E511-B18C-02163E0141F2.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/784/00000/CE8C4583-7EF3-E511-B9B2-02163E0145FD.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/785/00000/D0DB8718-D1F5-E511-823E-02163E014591.root'
+'/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/374/00000/7EC0E5B0-6AF1-E511-8099-02163E011D2C.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/375/00000/EE2A3C24-A8F1-E511-A21C-02163E0141EE.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/376/00000/F2A1D6A9-A8F1-E511-8BD0-02163E0140FB.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/267/377/00000/8A417F52-A7F1-E511-A150-02163E0134C0.root','/store/data/Commissioning2016/Cosmics/ALCARECO/TkAlCosmics0T-PromptReco-v1/000/268/738/00000/2A6F2784-61FE-E511-9BA8-02163E011EB7.root'

Alignment/HIPAlignmentAlgorithm/data/rewrite.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+i=0
+while read line
+do
+    name=$line
+		let i=i+1
+		if [ $(($i%1)) -eq 0 ]
+			then
+#			echo "'$name'" >> ALCARECOTkAlCosmicsCTF0T.dat_PromptReco 
+#                        echo "'$name'" >> ALCARECOTkAlCosmicsCTF0T.dat_StreamExpress
+                        echo "'$name'" >> ALCARECOTkAlMinBias.dat_2016B_Prompt_v1
+		else
+#			echo "'$name'" | tr "\n" "," >> ALCARECOTkAlCosmicsCTF0T.dat_PromptReco 
+#                        echo "'$name'" | tr "\n" "," >> ALCARECOTkAlCosmicsCTF0T.dat_StreamExpress
+                        echo "'$name'" | tr "\n" "," >> ALCARECOTkAlMinBias.dat_2016B_Prompt_v1
+		fi
+		#if [ $i -eq 51 ]
+		#	then break
+		#fi
+done < $1

Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h

@@ -50,20 +50,22 @@ class HIPAlignmentAlgorithm : public AlignmentAlgorithmBase
   bool processHit1D(const AlignableDetOrUnitPtr& alidet,
 		    const Alignable* ali,
 		    const TrajectoryStateOnSurface & tsos,
-		    const TrackingRecHit* hit);
+		    const TrackingRecHit* hit,
+                    double hitwt);
 
   bool processHit2D(const AlignableDetOrUnitPtr& alidet,
 		    const Alignable* ali,
 		    const TrajectoryStateOnSurface & tsos,
-		    const TrackingRecHit* hit);
-
+		    const TrackingRecHit* hit,
+                    double hitwt);  
+
   int readIterationFile(std::string filename);
   void writeIterationFile(std::string filename, int iter);
   void setAlignmentPositionError(void);
   double calcAPE(double* par, int iter, double function);
   void bookRoot(void);
   void fillRoot(const edm::EventSetup& setup);
-  bool calcParameters(Alignable* ali);
+  bool calcParameters(Alignable* ali,int setDet, double start, double step);
   void collector(void);
   int  fillEventwiseTree(const char *filename, int iter, int ierr);
   // private data members
@@ -86,7 +88,9 @@ class HIPAlignmentAlgorithm : public AlignmentAlgorithmBase
 
   // alignment position error parameters
   bool theApplyAPE;
+  bool themultiIOV;
   std::vector<edm::ParameterSet> theAPEParameterSet;
+	std::vector<unsigned> theIOVrangeSet;
   std::vector<std::pair<std::vector<Alignable*>, std::vector<double> > > theAPEParameters;
   // max allowed pull (residual / uncertainty) on a hit used in alignment
   double theMaxAllowedHitPull;
@@ -99,13 +103,17 @@ class HIPAlignmentAlgorithm : public AlignmentAlgorithmBase
   int theCollectorNJobs;
   std::string theCollectorPath;
   int theEventPrescale,theCurrentPrescale;
+  bool trackPs,trackWt,IsCollision,uniEta;
+  double Scale,cos_cut,col_cut;
   bool theFillTrackMonitoring;
+  std::vector<double> SetScanDet;
 
   std::vector<align::StructureType> theLevels; // for survey residuals
 
   // root tree variables
   TFile* theFile;
   TTree* theTree; // event-wise tree
+  TTree* hitTree; // hit-wise tree
   TFile* theFile2;
   TTree* theTree2; // alignable-wise tree
   TFile* theFile3;
@@ -115,7 +123,11 @@ class HIPAlignmentAlgorithm : public AlignmentAlgorithmBase
   static const int MAXREC = 99;
   //int m_Run,m_Event;
   int m_Ntracks,m_Nhits[MAXREC],m_nhPXB[MAXREC],m_nhPXF[MAXREC],m_nhTIB[MAXREC],m_nhTOB[MAXREC],m_nhTID[MAXREC],m_nhTEC[MAXREC];
-  float m_Pt[MAXREC],m_Eta[MAXREC],m_Phi[MAXREC],m_Chi2n[MAXREC],m_P[MAXREC],m_d0[MAXREC],m_dz[MAXREC];
+  float m_Pt[MAXREC],m_Eta[MAXREC],m_Phi[MAXREC],m_Chi2n[MAXREC],m_P[MAXREC],m_d0[MAXREC],m_dz[MAXREC],m_wt[MAXREC];
+
+  // variables for hit-wise tree
+  float m_sinTheta,m_hitwt,m_angle;
+  align::ID m_detId;
 
   // variables for alignable-wise tree
   int m2_Nhit,m2_Type,m2_Layer;

Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariables.h

@@ -11,7 +11,9 @@ class HIPUserVariables : public AlignmentUserVariables {
     jtve(npar,0) ,
     alichi2(0.0),
     alindof(0),
-    nhit(0)
+    nhit(0),
+    alipar(npar,0),
+    alierr(npar,0)
     //iterpar(maxiter,npar,0),
     //iterpos(maxiter,3,0),
     //iterrot(maxiter,9,0),
@@ -32,6 +34,8 @@ class HIPUserVariables : public AlignmentUserVariables {
   double alichi2;
   int alindof;
   int nhit;
+  AlgebraicVector alipar;
+  AlgebraicVector alierr;
   //AlgebraicMatrix iterpar;
   //AlgebraicMatrix iterpos,iterrot;
   //AlgebraicMatrix iterrpos,iterrrot;

Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariablesIORoot.h

@@ -60,6 +60,8 @@ class HIPUserVariablesIORoot : public AlignmentIORootBase,
   double Jtve[nparmax];
   double AlignableChi2;
   unsigned int AlignableNdof;
+  double Par[nparmax];
+  double ParError[nparmax];
 
   bool newopen;
   typedef  std::map< std::pair<int,int> , int > treemaptype;

Alignment/HIPAlignmentAlgorithm/iov_2016RunB.dat

@@ -0,0 +1 @@
+272497

Alignment/HIPAlignmentAlgorithm/plots/BinningHitMaps_TEC.txt

@@ -0,0 +1,2 @@
+******** Binning for Subdet TEC *********
+

Alignment/HIPAlignmentAlgorithm/plots/BinningHitMaps_TIB.txt

@@ -0,0 +1,14 @@
+******** Binning for Subdet TIB *********
+
+--> Layer #1
+Eta Binning: -4.31426e-15	0
+Phi Binning: -nan	-nan
+--> Layer #2
+Eta Binning: -4.31426e-15	0
+Phi Binning: -nan	-nan
+--> Layer #3
+Eta Binning: -222	0
+Phi Binning: -nan	-nan
+--> Layer #4
+Eta Binning: -222	0
+Phi Binning: -nan	-nan

Alignment/HIPAlignmentAlgorithm/plots/BinningHitMaps_TID.txt

@@ -0,0 +1,2 @@
+******** Binning for Subdet TID *********
+

Alignment/HIPAlignmentAlgorithm/plots/BinningHitMaps_TOB.txt

@@ -0,0 +1,20 @@
+******** Binning for Subdet TOB *********
+
+--> Layer #1
+Eta Binning: -4.31426e-15	0
+Phi Binning: -nan	-nan
+--> Layer #2
+Eta Binning: -4.31426e-15	0
+Phi Binning: -nan	-nan
+--> Layer #3
+Eta Binning: -222	0
+Phi Binning: -nan	-nan
+--> Layer #4
+Eta Binning: -222	0
+Phi Binning: -nan	-nan
+--> Layer #5
+Eta Binning: -222	0
+Phi Binning: -nan	-nan
+--> Layer #6
+Eta Binning: -222	0
+Phi Binning: -nan	-nan

Alignment/HIPAlignmentAlgorithm/plots/BinningHitMaps_TPB.txt

@@ -0,0 +1,11 @@
+******** Binning for Subdet TPB *********
+
+--> Layer #1
+Eta Binning: -222	0
+Phi Binning: -444	0
+--> Layer #2
+Eta Binning: -222	0
+Phi Binning: -nan	-nan
+--> Layer #3
+Eta Binning: -222	0
+Phi Binning: -nan	-nan

Alignment/HIPAlignmentAlgorithm/plots/BinningHitMaps_TPE.txt

@@ -0,0 +1,2 @@
+******** Binning for Subdet TPE *********
+