diff --git a/L1Trigger/L1THGCal/src/be_algorithms/HGCalClusteringImpl.cc b/L1Trigger/L1THGCal/src/be_algorithms/HGCalClusteringImpl.cc
index d48c5d229bc11..eef2bd0482085 100644
--- a/L1Trigger/L1THGCal/src/be_algorithms/HGCalClusteringImpl.cc
+++ b/L1Trigger/L1THGCal/src/be_algorithms/HGCalClusteringImpl.cc
@@ -44,7 +44,7 @@ void HGCalClusteringImpl::clusterize( const edm::PtrVector<l1t::HGCalTriggerCell
     /* search for cluster seeds */
     int itc=0;
     for( edm::PtrVector<l1t::HGCalTriggerCell>::const_iterator tc = triggerCellsPtrs.begin(); tc != triggerCellsPtrs.end(); ++tc,++itc ){
-        isSeed[itc] = ( (*tc)->hwPt() > seedThreshold_) ? true : false;
+        isSeed[itc] = ( (*tc)->mipPt() > seedThreshold_) ? true : false;
     }
     
     /* clustering the TCs */
@@ -53,7 +53,7 @@ void HGCalClusteringImpl::clusterize( const edm::PtrVector<l1t::HGCalTriggerCell
     itc=0;
     for( edm::PtrVector<l1t::HGCalTriggerCell>::const_iterator tc = triggerCellsPtrs.begin(); tc != triggerCellsPtrs.end(); ++tc,++itc ){
             
-        if( (*tc)->hwPt() < triggerCellThreshold_ ){
+        if( (*tc)->mipPt() < triggerCellThreshold_ ){
             continue;
         }
         
diff --git a/L1Trigger/L1THGCal/test/BuildFile.xml b/L1Trigger/L1THGCal/test/BuildFile.xml
index 91c9ab8c985a7..d79090e897bb5 100644
--- a/L1Trigger/L1THGCal/test/BuildFile.xml
+++ b/L1Trigger/L1THGCal/test/BuildFile.xml
@@ -6,7 +6,7 @@
 <use   name="DataFormats/L1Trigger"/>
 <use   name="SimDataFormats/CaloTest"/>
 
-<library name="testL1TriggerL1THGCal"  file="HGCalTriggerBestChoiceTester.cc,HGCalTriggerBestChoiceTriggerCellTester.cc,HGCalTriggerGeomTester.cc,HGCalTriggerBestChoiceMonitor.cc,HGCalTriggerThresholdTriggerCellTester.cc, calib/*.cc, hgc_clustering/*.cc">
+<library name="testL1TriggerL1THGCal"  file="HGCalTriggerBestChoiceTester.cc,HGCalTriggerBestChoiceTriggerCellTester.cc,HGCalTriggerGeomTester.cc,HGCalTriggerBestChoiceMonitor.cc,HGCalTriggerThresholdTriggerCellTester.cc, calib/*.cc">
 <flags   EDM_PLUGIN="1"/>
 </library>
 
diff --git a/L1Trigger/L1THGCal/test/L1Clustering_cfg.py b/L1Trigger/L1THGCal/test/L1Clustering_cfg.py
index 6c50004cba686..b6a2ddb252eda 100644
--- a/L1Trigger/L1THGCal/test/L1Clustering_cfg.py
+++ b/L1Trigger/L1THGCal/test/L1Clustering_cfg.py
@@ -132,12 +132,6 @@
 process.hgcalTriggerPrimitiveDigiProducer.BEConfiguration.algorithms = cms.VPSet( cluster_algo_all )
 process.hgcl1tpg_step = cms.Path( process.hgcalTriggerPrimitives )
 process.digi2raw_step = cms.Path( process.DigiToRaw )
-process.HGC_clustering = cms.EDAnalyzer("testHGCClustering",
-                                        #Luca triggerCellInputTag=cms.InputTag("hgcalTriggerPrimitiveDigiProducer:C2dClusterAlgoBestChoice")
-                                        clusterInputTag=cms.InputTag("hgcalTriggerPrimitiveDigiProducer:HGCClusterAlgoBestChoice")
-                                        )
-
-process.test_step = cms.Path(process.HGC_clustering)
 
 process.endjob_step = cms.EndPath(process.endOfProcess)
 process.FEVTDEBUGoutput_step = cms.EndPath(process.FEVTDEBUGoutput)
@@ -149,7 +143,7 @@
 # Schedule definition
 process.schedule = cms.Schedule( process.generation_step, process.genfiltersummary_step, process.simulation_step, 
                                  process.digitisation_step, process.L1simulation_step, process.hgcl1tpg_step, 
-                                 process.digi2raw_step, #process.test_step,
+                                 process.digi2raw_step,
                                  process.ntuple_step,
                                  process.endjob_step, 
                                  process.FEVTDEBUGoutput_step
diff --git a/L1Trigger/L1THGCal/test/testNtuplyzer_cfg.py b/L1Trigger/L1THGCal/test/testNtuplyzer_cfg.py
index 1c9b9ac502610..a7947c0f8453f 100644
--- a/L1Trigger/L1THGCal/test/testNtuplyzer_cfg.py
+++ b/L1Trigger/L1THGCal/test/testNtuplyzer_cfg.py
@@ -54,6 +54,8 @@
         2 ** process.hgcalTriggerPrimitiveDigiProducer.FECodec.triggerCellTruncationBits.value() 
 )
 
+# Adjust the max-dR for 2D-clustering
+process.hgcalTriggerPrimitiveDigiProducer.BEConfiguration.algorithms[0].C2d_parameters.dR_cluster = cms.double(3.)
 
 trgCells_algo_all =  cms.PSet( AlgorithmName = cms.string('SingleCellClusterAlgoBestChoice'),
                                FECodec = process.hgcalTriggerPrimitiveDigiProducer.FECodec,
@@ -73,11 +75,6 @@
 process.hgcalTriggerPrimitiveDigiProducer.BEConfiguration.algorithms = cms.VPSet( cluster_algo_all )
 process.hgcl1tpg_step = cms.Path( process.hgcalTriggerPrimitives ) 
 process.digi2raw_step = cms.Path( process.DigiToRaw )
-#process.HGC_clustering = cms.EDAnalyzer("testHGCClustering",
-#                                        clusterInputTag=cms.InputTag("hgcalTriggerPrimitiveDigiProducer:HGCClusterAlgoBestChoice")
-#                                        )
-
-#process.test_step = cms.Path(process.HGC_clustering)
 
 process.endjob_step = cms.EndPath(process.endOfProcess)
 
@@ -87,8 +84,7 @@
                                    
 # Schedule definition
 process.schedule = cms.Schedule( process.hgcl1tpg_step, 
-                                 #process.digi2raw_step, 
-                                 #process.test_step, 
+                                 #process.digi2raw_step,
                                  process.ntuple_step, # create the persistent event 
                                  process.endjob_step
                                  )