update default values for APE,alignables. Remove cout from HIPAlignme…

…ntAlgorithm.cc.
cms-sw · May 27, 2016 · 375701d · 375701d
1 parent e872db3
commit 375701d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 62 deletions.
diff --git a/Alignment/HIPAlignmentAlgorithm/data/ALCARECOTkAlCosmicsCTF0T.dat b/Alignment/HIPAlignmentAlgorithm/data/ALCARECOTkAlCosmicsCTF0T.dat
diff --git a/Alignment/HIPAlignmentAlgorithm/data/ALCARECOTkAlMinBias.dat b/Alignment/HIPAlignmentAlgorithm/data/ALCARECOTkAlMinBias.dat
diff --git a/Alignment/HIPAlignmentAlgorithm/python/align_tpl_py.txt b/Alignment/HIPAlignmentAlgorithm/python/align_tpl_py.txt
@@ -57,8 +57,8 @@ else :
 
 process.AlignmentProducer.algoConfig.outfile =  '<PATH>/HIPAlignmentEvents.root'
 process.AlignmentProducer.algoConfig.outfile2 = '<PATH>/HIPAlignmentAlignables.root'
-#process.AlignmentProducer.algoConfig.applyAPE = False
-process.AlignmentProducer.algoConfig.applyAPE = True 
+process.AlignmentProducer.algoConfig.applyAPE = False
+#process.AlignmentProducer.algoConfig.applyAPE = True 
 process.AlignmentProducer.algoConfig.apeParam = cms.VPSet(
          cms.PSet(function = cms.string('linear'), #choose from linear,exponential,step
                   apeRPar = cms.vdouble(0.0001, 0.0, 20.0), #100 micro-rad

diff --git a/Alignment/HIPAlignmentAlgorithm/python/common_cff_py.txt b/Alignment/HIPAlignmentAlgorithm/python/common_cff_py.txt
@@ -19,8 +19,8 @@ from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
 from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
 from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-#process.load("Configuration.StandardSequences.MagneticField_cff")
-process.load("Configuration.StandardSequences.MagneticField_38T_cff")
+process.load("Configuration.StandardSequences.MagneticField_cff")
+#process.load("Configuration.StandardSequences.MagneticField_38T_cff")
 #process.load("Configuration.StandardSequences.MagneticField_0T_cff")
 
 # loading the alignment producer
@@ -30,8 +30,6 @@ process.load("Alignment.CommonAlignmentProducer.AlignmentProducer_cff")
 #process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 
-#process.GlobalTag.globaltag = '80X_dataRun2_Prompt_Candidate_2016_04_18_10_23_57'  #next-to-last one of 2015 EOY IOV
-#process.GlobalTag.globaltag = '80X_dataRun2_Express_v7' #2016 first collision,before weasel incident
 process.GlobalTag.globaltag = '80X_dataRun2_Prompt_Candidate_2016_05_12_11_59_51'
 
 process.load("FWCore.MessageService.MessageLogger_cfi")
@@ -42,7 +40,6 @@ from CondCore.CondDB.CondDB_cfi import *
 
 process.GlobalTag.toGet = cms.VPSet(
     cms.PSet(record = cms.string('TrackerAlignmentRcd'),
-#             tag = cms.string('TrackerAlignment_2015-EOY_IOV09'),
 #             tag = cms.string('TrackerAlignment_2009_v1_express'),
              tag = cms.string('TrackerAlignment_Run2016A_PseudoPCL_v1'),
 #             tag = cms.string('Alignments'),
@@ -90,15 +87,15 @@ process.AlignmentProducer.ParameterBuilder.Selector = cms.PSet(
     alignParams = cms.vstring(
 #        'TrackerTPBHalfBarrel,001000',
 
-#        'TrackerTPBHalfBarrel,111111',
-#        'TrackerTPEHalfCylinder,111111',
+        'TrackerTPBHalfBarrel,111111',
+        'TrackerTPEHalfCylinder,111111',
         'TrackerTIBHalfBarrel,111111',
         'TrackerTOBHalfBarrel,111111',
         'TrackerTIDEndcap,111111',
         'TrackerTECEndcap,111111',
 
-      'TrackerTPBModule,111111',
-      'TrackerTPEModule,111111',
+#      'TrackerTPBModule,111111',
+#      'TrackerTPEModule,111111',
 #      'TrackerTIBModuleUnit,111111',
 #      'TrackerTOBModuleUnit,111111',
 #      'TrackerTIDModuleUnit,111111',

diff --git a/Alignment/HIPAlignmentAlgorithm/scripts/minbiascosmicsMC09.lst b/Alignment/HIPAlignmentAlgorithm/scripts/minbiascosmicsMC09.lst
diff --git a/Alignment/HIPAlignmentAlgorithm/scripts/minbiasonly.lst b/Alignment/HIPAlignmentAlgorithm/scripts/minbiasonly.lst
diff --git a/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc b/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc
@@ -138,7 +138,7 @@ HIPAlignmentAlgorithm::initialize( const edm::EventSetup& setup,
 //  const Rcd & record = setup.get<TrackerAlignmentRcd>();
   const edm::ValidityInterval & validity = setup.get<TrackerAlignmentRcd>().validityInterval();
   const edm::IOVSyncValue first1 = validity.first();
-	std::cout << "xiaomeng "<<first1.eventID().run()<<std::endl;
+//	std::cout << "xiaomeng "<<first1.eventID().run()<<std::endl;
 	unsigned int firstrun = first1.eventID().run();
 	if(themultiIOV){
 		if(theIOVrangeSet.size()!=1){
@@ -162,7 +162,8 @@ HIPAlignmentAlgorithm::initialize( const edm::EventSetup& setup,
 			}
 		}
 		if(!findMatchIOV){
-			std::cout <<"error! Didn't find the matched IOV file"<<std::endl;
+//			std::cout <<"error! Didn't find the matched IOV file"<<std::endl;
+                       edm::LogWarning("Alignment") << "error! Didn't find the matched IOV file!";
 		}
 		}
 		else{
@@ -172,7 +173,7 @@ HIPAlignmentAlgorithm::initialize( const edm::EventSetup& setup,
 				salignedfile.replace(salignedfile.end()-5, salignedfile.end(),iovapp);
 				siterationfile.replace(siterationfile.end()-5, siterationfile.end(),iovapp);
 		}
-		std::cout<< "xiaomeng "<< salignedfile <<std::endl;
+//		std::cout<< "xiaomeng "<< salignedfile <<std::endl;
 	}
 
   // accessor Det->AlignableDet