Changeset 100 in svn for trunk/Utilities/Fastjet/plugins/CDFCones/src

Timestamp:

Dec 18, 2008, 2:39:26 PM (16 years ago)

Author:

severine ovyn

Message:

Remove datacard bug + CaloTowers OK

File:

• trunk/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.cc (modified) (5 diffs)

trunk/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.cc

@@ +1 @@
+#include "../interface/CalTower.hh"
 #include "../interface/JetCluAlgorithm.hh"
 #include "../interface/ClusterComparisons.hh"
@@ -4 +5 @@
 #include <algorithm>
 #include <cmath>
-
-void JetCluAlgorithm::makeSeedTowers(std::vector<PhysicsTower>& towers, std::vector<Cluster>& seedTowers)
+#include <iostream>
+
+using namespace std;
+/*void JetCluAlgorithm::makeSeedTowers(std::vector<PhysicsTower>& towers, std::vector<Cluster>& seedTowers)
 {
   for(int iEta = 4; iEta < 48; iEta++){
@@ -22 +25 @@
   }
   sort(seedTowers.begin(),seedTowers.end(),ClusterCentroidEtGreater());
-}
+}*/
+
+void JetCluAlgorithm::makeSeedTowers(std::vector<PhysicsTower>& towers, std::vector<Cluster>& seedTowers)
+{
+  for(int iEta = 0; iEta < 2*ntower; iEta++){
+
+    int myphiindex = (iEta<ntower) ? iEta : iEta-ntower;
+    int nphi =  (int) 360/tower_dphi[myphiindex]; // number of phi segments for this eta
+    for(int iPhi = 0; iPhi < nphi; iPhi++){
+      Cluster seed;
+      for(std::vector<PhysicsTower>::iterator towerIter = towers.begin(); towerIter != towers.end(); towerIter++)
+        if(towerIter->iEta() == iEta && towerIter->iPhi() == iPhi ) {
+          seed.addTower(*towerIter);
+        }
+      if(seed.centroid.Et > _seedThreshold) {
+        seedTowers.push_back(seed);
+      }
+    }
+  }
+  sort(seedTowers.begin(),seedTowers.end(),ClusterCentroidEtGreater());
+}
+
 
 void JetCluAlgorithm::buildPreClusters(std::vector<Cluster>& seedTowers, std::vector<PhysicsTower>& towers,
@@ -40 +64 @@
         int iEtaSeedTower = seedTowerIter->towerList.begin()->iEta();
         int iPhiSeedTower = seedTowerIter->towerList.begin()->iPhi();
-        if(iEtaSeedTower >= 8 && iEtaSeedTower < 14 || iEtaSeedTower >= 38 && iEtaSeedTower < 44)
-          iPhiSeedTower = iPhiSeedTower/2;
+//      if(iEtaSeedTower >= 8 && iEtaSeedTower < 14 || iEtaSeedTower >= 38 && iEtaSeedTower < 44)
+//        iPhiSeedTower = iPhiSeedTower/2;
         for(std::vector<PhysicsTower>::iterator preClusterTowerIter = preClusterIter->towerList.begin();
             preClusterTowerIter != preClusterIter->towerList.end() && !seedTowerAddedToPreCluster;
@@ -47 +71 @@
           int iEtaPreClusterTower = preClusterTowerIter->iEta();
           int iPhiPreClusterTower = preClusterTowerIter->iPhi();
-          if(iEtaPreClusterTower >= 8 && iEtaPreClusterTower < 14 || iEtaPreClusterTower >= 38 && iEtaPreClusterTower < 44)
-            iPhiPreClusterTower = iPhiPreClusterTower/2;
+//        if(iEtaPreClusterTower >= 8 && iEtaPreClusterTower < 14 || iEtaPreClusterTower >= 38 && iEtaPreClusterTower < 44)
+//          iPhiPreClusterTower = iPhiPreClusterTower/2;
           int dIEta = abs(iEtaSeedTower - iEtaPreClusterTower);
           int dIPhi = abs(iPhiSeedTower - iPhiPreClusterTower);
-          if(dIPhi > 12)
-            dIPhi = 24 - dIPhi;
+//        if(dIPhi > 12)
+//          dIPhi = 24 - dIPhi;
           int adj = dIPhi*dIPhi + dIEta*dIEta;
           if(adj <= _adjacencyCut){