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

Timestamp:

Nov 17, 2008, 11:07:45 PM (16 years ago)

Author:

Xavier Rouby

Message:

first attemp towers CMS

File:

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

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

@@ -18 +18 @@
   std::vector< std::vector<bool> > distanceOK;
   distanceOK.resize(stableCones.size() - 1);
-  for(int nCluster1 = 1; nCluster1 < stableCones.size(); nCluster1++){
+  for(unsigned int nCluster1 = 1; nCluster1 < stableCones.size(); nCluster1++){
     distanceOK[nCluster1 - 1].resize(nCluster1);
     double cluster1Rapidity = stableCones[nCluster1].fourVector.y();
     double cluster1Phi      = stableCones[nCluster1].fourVector.phi();
-    for(int nCluster2 = 0; nCluster2 < nCluster1; nCluster2++){
+    for(unsigned int nCluster2 = 0; nCluster2 < nCluster1; nCluster2++){
       double cluster2Rapidity = stableCones[nCluster2].fourVector.y();
       double cluster2Phi      = stableCones[nCluster2].fourVector.phi();
@@ -37 +37 @@
   std::vector< std::vector<int> > pairs(0);
   std::vector<int> testPair(0);
-  int maxClustersInPair = _maxPairSize;
+  unsigned int maxClustersInPair = _maxPairSize;
   if(!maxClustersInPair)
     maxClustersInPair = stableCones.size();
@@ -44 +44 @@
   // Loop over all combinations. Calculate MidPoint. Make midPointClusters.
   bool reduceConeSize = false;
-  for(int iPair = 0; iPair < pairs.size(); iPair++){
+  for(unsigned int iPair = 0; iPair < pairs.size(); iPair++){
     // Calculate rapidity, phi and pT of MidPoint.
     LorentzVector midPoint(0,0,0,0);
-    for(int iPairMember = 0; iPairMember < pairs[iPair].size(); iPairMember++)
+    for(unsigned int iPairMember = 0; iPairMember < pairs[iPair].size(); iPairMember++)
       midPoint.add(stableCones[pairs[iPair][iPairMember]].fourVector);
     iterateCone(midPoint.y(),midPoint.phi(),midPoint.pt(),towers,stableCones,reduceConeSize);
@@ -116 +116 @@
 
 void MidPointAlgorithm::addClustersToPairs(std::vector<int>& testPair, std::vector< std::vector<int> >& pairs,
-                                           std::vector< std::vector<bool> >& distanceOK, int maxClustersInPair)
+                                           std::vector< std::vector<bool> >& distanceOK, unsigned int maxClustersInPair)
 {
   // Recursively adds clusters to pairs, triplets, ... whose mid-points are then calculated.
@@ -124 +124 @@
   if(testPair.size())
     nextClusterStart = testPair.back() + 1;
-  for(int nextCluster = nextClusterStart; nextCluster <= distanceOK.size(); nextCluster++){
+  for(unsigned int nextCluster = nextClusterStart; nextCluster <= distanceOK.size(); nextCluster++){
     // Is new SeedCone less than 2*_coneRadius apart from all clusters in testPair?
     bool addCluster = true;
-    for(int iCluster = 0; iCluster < testPair.size() && addCluster; iCluster++)
+    for(unsigned int iCluster = 0; iCluster < testPair.size() && addCluster; iCluster++)
       if(!distanceOK[nextCluster - 1][testPair[iCluster]])
         addCluster = false;