Update PR per request from Gregor

cms-sw · Feb 23, 2017 · 8937d04 · 8937d04
1 parent bafeb73
commit 8937d04
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 7 deletions.
diff --git a/Alignment/HIPAlignmentAlgorithm/plots/HIPplots.cc b/Alignment/HIPAlignmentAlgorithm/plots/HIPplots.cc
@@ -53,7 +53,8 @@ TLegend*  HIPplots::MakeLegend(double x1,
   legend->SetFillColor(0);
   legend->SetBorderSize(0);
   int COLOR_CODE[6]={ 28, 2, 3, 4, 6, 7 };
-
+
+  // TO BE UPDATED FOR PHASE-1
   TString detNames[6];
   detNames[0] = TString("PXB");
   detNames[1] = TString("PXF");
@@ -1014,6 +1015,7 @@ int HIPplots::GetNIterations(TDirectory* f, char* tag, int startingcounter){
 
 int HIPplots::GetSubDet(unsigned int id){
 
+  // TO BE UPDATED FOR PHASE-1
   const int reserved_subdetectorstartbit=25;
   const int reserved_subdetectorfinalbit=27;
 

diff --git a/Alignment/HIPAlignmentAlgorithm/plots/HIPplots.h b/Alignment/HIPAlignmentAlgorithm/plots/HIPplots.h
@@ -54,4 +54,4 @@ class HIPplots{
   bool plotbadchi2;
 };
 
-#endif
+#endif
diff --git a/Alignment/HIPAlignmentAlgorithm/plots/loadLib.C b/Alignment/HIPAlignmentAlgorithm/plots/loadLib.C
@@ -3,4 +3,4 @@
   gROOT->ProcessLine("setTDRStyle()");
   gROOT->ProcessLine(".L HIPplots.cc+");
   gROOT->ProcessLine(".L plotter.C+");
-}
+}
diff --git a/Alignment/HIPAlignmentAlgorithm/plots/tdrstyle.C b/Alignment/HIPAlignmentAlgorithm/plots/tdrstyle.C
@@ -150,4 +150,4 @@ void setTDRStyle()
   // tdrStyle->SetHistMinimumZero(kTRUE);
 
   tdrStyle->cd();
-}
+}
diff --git a/...nt/HIPAlignmentAlgorithm/scripts/batch.py → ...PAlignmentAlgorithm/scripts/batchHippy.py b/...nt/HIPAlignmentAlgorithm/scripts/batch.py → ...PAlignmentAlgorithm/scripts/batchHippy.py
diff --git a/...IPAlignmentAlgorithm/scripts/configure.pl → ...gnmentAlgorithm/scripts/configureHippy.pl b/...IPAlignmentAlgorithm/scripts/configure.pl → ...gnmentAlgorithm/scripts/configureHippy.pl
diff --git a/Alignment/HIPAlignmentAlgorithm/scripts/iterator_py b/Alignment/HIPAlignmentAlgorithm/scripts/iterator_py
@@ -18,7 +18,7 @@ set odir = `cd $2; pwd` # get full output path
 set errfile = "$odir/ERROR"
 
 # configure all of the scripts
-scripts/configure.pl $odir $3 $4 $5 $6
+scripts/configureHippy.pl $odir $3 $4 $5 $6
 
 if ( -f $errfile ) then
    echo "$errfile exists! Please fix the errors and re-run."

diff --git a/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc b/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc
@@ -393,7 +393,6 @@ void HIPAlignmentAlgorithm::terminate(const edm::EventSetup& iSetup)
     bool test = calcParameters(ali,SetScanDet.at(0),SetScanDet.at(1),SetScanDet.at(2));
     // if successful, apply parameters
     if (test){
-      //edm::LogWarning("HIPAlignmentAlgorithm") << "now apply params";
       theAlignmentParameterStore->applyParameters(ali);
       // set these parameters 'valid'
       ali->alignmentParameters()->setValid(true);
@@ -1268,7 +1267,6 @@ bool HIPAlignmentAlgorithm::calcParameters(Alignable* ali , int setDet, double s
 
   if ( (setDet==0) && (nhit < theMinimumNumberOfHits)) {
     par->setValid(false);
-    //edm::LogInfo("HIPAlignmentAlgorithm") << "nhit=" << nhit << " too small,skip!";
     return false;
   }
 

diff --git a/...ent/HIPAlignmentAlgorithm/data/breakup.sh → ...ignmentAlgorithm/test/breakupHippyList.sh b/...ent/HIPAlignmentAlgorithm/data/breakup.sh → ...ignmentAlgorithm/test/breakupHippyList.sh
diff --git a/...ent/HIPAlignmentAlgorithm/data/rewrite.sh → ...ignmentAlgorithm/test/rewriteHippyList.sh b/...ent/HIPAlignmentAlgorithm/data/rewrite.sh → ...ignmentAlgorithm/test/rewriteHippyList.sh