---

yaml
---
r: 121019
b: "refs/heads/CMSSW_7_0_X"
c: a937e31
h: "refs/heads/CMSSW_7_0_X"
i:
  121017: 95e20f1
  121015: 87ade4d
v: v3

[refs]

@@ -2,4 +2,4 @@
 "refs/heads/hi_d20131223": d7335b053d7fe03e98f9f59af6a20004362628e8
 refs/heads/gh-pages: a3d9046c56a3ca3dc64ad63f7295276c81ac876a
 "refs/heads/analysis_53X_01": 3019419e9784b2b092fc6b5c503b2e0177cbe926
-"refs/heads/CMSSW_7_0_X": 47f6236dce8b0c284d0e8f6c38bbd8b52e84fc03
+"refs/heads/CMSSW_7_0_X": a937e316e95e94fb9dccab7d56386b0ac8c549ce

trunk/SLHCUpgradeSimulations/L1CaloTrigger/plugins/L1TowerJetFilter1D.cc

@@ -45,6 +45,28 @@ bool operator> ( JetWrapper& aA , JetWrapper& aB )
           return ( abs( aA.mJet-> AsymEta() )  <= abs(  aB.mJet->AsymEta() ) );	
   }	
 
+
+//   //try sorting by asymmetry first
+//   //Needs tweaking to get jet centre rather than top LH corner: this is done when calculate real jet eta, phi
+//   //want the lowest asymmetry at the top of the list
+//   if ( *(aA.mComparisonDirection) == phi ){
+// 
+//     if ( abs(aA.mJet->AsymPhi() ) < abs( aB.mJet->AsymPhi() ) ) return true; 
+//     if ( abs(aA.mJet->AsymPhi() ) > abs( aB.mJet->AsymPhi() ) ) return false;
+// 
+//   }else{
+// 
+//     if ( abs( aA.mJet->AsymEta() ) < abs( aB.mJet->AsymEta() ) ) return true; 
+//     if ( abs( aA.mJet->AsymEta() ) > abs( aB.mJet->AsymEta() ) ) return false;
+// 
+//   }
+// 
+//   //if have the same jet asymmetry sort by energy: those that remain have the same asym
+//   if ( aA.mJet->E() >= aB.mJet->E() ) return true;
+//   else return ( aA.mJet->E() < aB.mJet->E() ) ;
+
+
+
 }
 
 
@@ -138,7 +160,11 @@ void L1TowerJetFilter1D::algorithm( const int &aEta, const int &aPhi )
 
 
 //  std::cout << "Sorting Jets produced by " << sourceName() << std::endl;  
-
+    for( std::vector<JetWrapper>::iterator lIt =lJetWrapperVector.begin(); lIt != lJetWrapperVector.end(); ++lIt){
+      if( (*lIt).mJet )	{
+        std::cout << "Before sort, (eta, phi) = " << (*lIt).mJet->iEta() << " " << (*lIt).mJet->iPhi() <<"  energy " << (*lIt).mJet->E() << " and asym in phi = " << (*lIt).mJet->AsymPhi() << " and asym in eta = " << (*lIt).mJet->AsymEta() <<std::endl;	
+      }
+    }
 
   // sort jets around eta/phi by energy
   std::vector<JetWrapper>::iterator lStart( lJetWrapperVector.begin() );