PR cleaning

.clang-format

@@ -1,4 +1,4 @@
-macs -nw 2	---
+---
 Language:        Cpp
 BasedOnStyle:  Google
 ColumnLimit:     120

RecoLocalCalo/HGCalRecProducers/plugins/HGCalRecHitProducer.cc

@@ -114,7 +114,6 @@ void HGCalRecHitProducer::produce(edm::Event& evt, const edm::EventSetup& es) {
   }
 
   // sort collections before attempting recovery, to avoid insertion of double recHits
-  /*
   eeRecHits->sort();
   hefRecHits->sort();
   hebRecHits->sort();
@@ -127,11 +126,9 @@ void HGCalRecHitProducer::produce(edm::Event& evt, const edm::EventSetup& es) {
   evt.put(std::move(eeRecHits), eeRechitCollection_);
   evt.put(std::move(hefRecHits), hefRechitCollection_);
   evt.put(std::move(hebRecHits), hebRechitCollection_);
-  */
 
   // do the same for HFNose hits
   if (pHGChfnoseUncalibRecHits.isValid()) {
-    printf("WRONG: NOSE!!!!!!\n");
     auto hfnoseRecHits = std::make_unique<HGChfnoseRecHitCollection>();
     for (auto it = hfnoseUncalibRecHits->begin(); it != hfnoseUncalibRecHits->end(); ++it) {
       worker_->run(evt, *it, *hfnoseRecHits);

RecoLocalCalo/HGCalRecProducers/python/HGCalRecHit_cfi.py

@@ -104,7 +104,7 @@
     #With the new regional em factors there are 7 different factors used. 
     #Six of them are for silicon and one for scint. For silicon it is in the following order
     # CE_E_120um, CE_E_200um, CE_E_300um, CE_H_120um, CE_H_200um, CE_H_300um
-    thicknessCorrection = cms.vdouble(1.132,1.092,1.084,1.,1.,1.), # 100, 200, 300 um #the last three numbers were added by B. Alves on 31/08/2020
+    thicknessCorrection = cms.vdouble(1.132,1.092,1.084,1.0,1.0,1.0),
     deltasi_index_regemfac = cms.int32(3),
     #One factor for scint 
     sciThicknessCorrection = cms.double(1.0),

UserCode/Timing/python/HeterogeneousRecHitsTiming_cfg.py → RecoLocalCalo/HGCalRecProducers/test/HeterogeneousRecHitsTiming_cfg.py

@@ -5,7 +5,7 @@
 from RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi import HGCalRecHit
 
 PU=0
-withGPU=1
+withGPU=0
 
 #package loading
 process = cms.Process("gpuTiming", gpu) if withGPU else cms.Process("cpuTiming")
@@ -24,15 +24,13 @@
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '')
 
 indir =  '/home/bfontana/' #'/eos/user/b/bfontana/Samples/'
-filename_suff = 'hadd_out_PU' + str(PU) #'step3_ttbar_PU' + str(PU)
+filename_suff = 'hadd_out_PU' + str(PU) + '_uncompressed' #'step3_ttbar_PU' + str(PU)
 fNames = [ 'file:' + x for x in glob.glob(os.path.join(indir, filename_suff + '*.root')) ]
 if len(fNames)==0:
     print('Used globbing: ', glob.glob(os.path.join(indir, filename_suff + '*.root')))
     raise ValueError('No input files!')
 print('Input: ', fNames)
 keep = 'keep *'
-#drop1 = 'drop CSCDetIdCSCALCTPreTriggerDigiMuonDigiCollection_simCscTriggerPrimitiveDigis__HLT'
-#drop2 = 'drop HGCRecHitsSorted_HGCalRecHit_HGC*E*RecHits_*'
 process.source = cms.Source("PoolSource",
                             fileNames = cms.untracked.vstring(fNames),
                             inputCommands = cms.untracked.vstring(keep),
@@ -73,34 +71,38 @@
 process.MessageLogger.categories.append('ThroughputService')
 
 if withGPU:
-    """
     process.ee_t = cms.Task( process.EERecHitGPUProd, process.EERecHitGPUtoSoAProd, process.EERecHitFromSoAProd )
     process.hef_t = cms.Task( process.HEFRecHitGPUProd, process.HEFRecHitGPUtoSoAProd, process.HEFRecHitFromSoAProd )
     process.heb_t = cms.Task( process.HEBRecHitGPUProd, process.HEBRecHitGPUtoSoAProd, process.HEBRecHitFromSoAProd )
-    """
-    process.ee_t = cms.Task( process.EERecHitGPUProd, process.EERecHitGPUtoSoAProd)
-    process.hef_t = cms.Task( process.HEFRecHitGPUProd, process.HEFRecHitGPUtoSoAProd)
-    process.heb_t = cms.Task( process.HEBRecHitGPUProd, process.HEBRecHitGPUtoSoAProd)
     process.recHitsTask = cms.Task( process.ee_t, process.hef_t, process.heb_t )
-    #outkeeps = ['keep *_*_' + f + '*_*' for f in ['HeterogeneousHGCalEERecHits', 'HeterogeneousHGCalHEFRecHits', 'HeterogeneousHGCalHEBRecHits']]
+    outkeeps = ['keep *_*_' + f + '*_*' for f in ['HeterogeneousHGCalEERecHits', 'HeterogeneousHGCalHEFRecHits', 'HeterogeneousHGCalHEBRecHits']]
 else:
     process.recHitsClone = HGCalRecHit.clone()
     process.recHitsTask = cms.Task( process.recHitsClone ) #CPU version
     outkeeps = ['keep *_*_' + f + '*_*' for f in ['HGCEERecHits', 'HGCHEFRecHits', 'HGCHEBRecHits'] ]
 
 process.path = cms.Path( process.recHitsTask )
 
-process.consumer = cms.EDAnalyzer("GenericConsumer",
-                                  eventProducts = cms.untracked.vstring('EERecHitGPUtoSoAProd',
-                                                                        'HEFRecHitGPUToSoAProd',
-                                                                        'HEBRecHitGPUToSoAProd') )
+"""
+process.consumer = cms.EDAnalyzer("GenericConsumer",                     
+                                  eventProducts = cms.untracked.vstring('EERecHitGPUProd',
+                                                                        'HEFRecHitGPUProd',
+                                                                        'HEBRecHitGPUProd') )
+"""
+"""
+process.consumer = cms.EDAnalyzer('GenericConsumer',
+                                  eventProducts = cms.untracked.vstring('recHitsClone') )
+                                  #eventProducts = cms.untracked.vstring('HGCalUncalibRecHit') ) #uncalib only (to assess reading speed)
+"""
+"""
 process.consume_step = cms.EndPath(process.consumer)
+"""
 
 process.out = cms.OutputModule( "PoolOutputModule", 
-                                fileName = cms.untracked.string( '/home/bfontana/out_Timing_PU' + str(PU) + '_' +str(withGPU)+ '.root')
-                                #outputCommands = cms.untracked.vstring(outkeeps[0], outkeeps[1], outkeeps[2]),
+                                fileName = cms.untracked.string( '/home/bfontana/out_Timing_PU' + str(PU) + '_' +str(withGPU)+ '.root'),
+                                outputCommands = cms.untracked.vstring(outkeeps[0], outkeeps[1], outkeeps[2])
 )
 process.outpath = cms.EndPath(process.out)
 
 
-#process.schedule.append(process.consume_step) #in case I have multiple Paths or EndPaths to run
+#process.schedule.append(process.consume_step) #in case one has multiple Paths or EndPaths to run