Adapt to updated UT channel ID class and geometry

(1) Changes based on new UT geometry & channelID (2) stripID shifted. Now start from 0 instead of 1

Work with DDDB!79, SIMCOND!143, LHCb!2995 (merged), Lbcom!550 (merged), Moore!785 (merged), Allen!865 (merged), PRConfig!230, Detector!181 (merged)

Pr/PrMCTools/src/PrLHCbID2MCParticle.cpp

@@ -13,6 +13,7 @@
 #include "Event/LinksByKey.h"
 #include "Event/MCParticle.h"
 #include "Event/UTCluster.h"
+#include "Event/UTDigit.h"
 #include "Event/VPFullCluster.h"
 #include "Event/VPLightCluster.h"
 #include "MuonDAQ/MuonHitContainer.h"
@@ -76,14 +77,23 @@ namespace {
 
   /// link all particles to the specified id
   void linkAll( const LHCb::LinksByKey& ilink, LHCb::LinksByKey& olink, const LHCb::MCParticles& mcParts,
-                LHCb::LHCbID id, const std::vector<unsigned int>& ids, BufferedType& nullMCParticles_counter ) {
+                LHCb::LHCbID id, const std::vector<unsigned int>& ids, BufferedType& nullMCParticles_counter,
+                bool test = true ) {
     std::vector<const LHCb::MCParticle*> partList;
     partList.reserve( ids.size() );
+    // if (test == false) std::cout<<"test in linkAll: ids.size() = "<<ids.size()<<std::endl;
     for ( auto subID : ids ) {
-      ilink.applyToLinks( subID, [&mcParts, &partList]( unsigned int, unsigned int tgtIndex, float ) {
+      ilink.applyToLinks( subID, [&mcParts, &partList, &test, &subID]( unsigned int, unsigned int tgtIndex, float ) {
         const LHCb::MCParticle* mcPart = static_cast<const LHCb::MCParticle*>( mcParts.containedObject( tgtIndex ) );
         partList.push_back( mcPart );
+        // if (test == false){std::cout<<subID<<" ; "<<mcPart->particleID()<<" ; "<<mcPart->momentum()<<std::endl;}
       } );
+      // if (test == false) std::cout<<"keyIndex.size() = "<<ilink.keyIndex().size()<<std::endl;
+#if 0
+	for(auto iter : ilink.keyIndex()){
+	   std::cout<<iter.first<<" ; "<<iter.second<<std::endl;
+	}
+#endif
     }
 
     // Remove any null entries -- the muon linking seems to produce a few of these...
@@ -147,13 +157,17 @@ namespace {
   struct LoopOverClusters<UT::HitHandler> {
     void operator()( const UT::HitHandler& hitHandler, const LHCb::LinksByKey& clusterLink, LHCb::LinksByKey& idLink,
                      const LHCb::MCParticles& mcParts, BufferedType& nullMCParticles_counter ) {
+      // std::cout<<"A TEST IN LoopOverClusters<UT::HitHandler>"<<std::endl;
       for ( unsigned int station = 1; station < 3; station++ ) {
         for ( unsigned int layer = 1; layer < 3; layer++ ) {
           for ( unsigned int region = 1; region < 4; region++ ) {
             for ( unsigned int sector = 1; sector < 99; sector++ ) {
               for ( const auto& hit : hitHandler.hits( station, layer, region, sector ) ) {
                 linkAll( clusterLink, idLink, mcParts, hit.chanID(),
-                         {boost::numeric_cast<unsigned int>( hit.chanID().channelID() )}, nullMCParticles_counter );
+                         {boost::numeric_cast<unsigned int>( hit.chanID().channelID() )}, nullMCParticles_counter,
+                         false );
+                // std::cout<<"TEST IN LoopOverClusters: "<<hit.chanID()<<" <> "<<hit.chanID().channelID()<<std::endl;
+                // std::cout<<clusterLink<<" <<----->> "<<idLink<<std::endl;
               }
             }
           }
@@ -221,7 +235,50 @@ public:
                          KeyValue( getLocation<ContainerType>(), "" )...,
                          KeyValue( getLinkLocation<ContainerType>(), "" )...,
                      },
-                     KeyValue( "TargetName", "Link/Pr/LHCbID" ) ) {}
+                     KeyValue( "TargetName", "Link/Pr/LHCbID" ) ) {
+#if 0
+    std::cout<<"test for getLinkLocation<ContainerType>() = "<<name<<" ; "<<std::endl;
+    this->inputLocation();
+    std::cout<<"can do inputLocation()"<<std::endl;
+    std::cout<<this->inputLocationSize()<<std::endl;
+    for(int i=0; i<this->inputLocationSize(); i++){
+	 std::cout<<std::get<i>this->m_imputs<<std::endl;
+    }
+    std::cout<<this->inputLocation()<<std::endl;
+    this->outputLocation();
+    std::cout<<"can do outputLocation()"<<std::endl;
+    std::cout<<this->outputLocationSize()<<std::endl;
+    //const auto* utll = this->getIfExists();
+    //const auto* utll = this->getIfExists<LHCb::LinksByKey*>( "/Event/Link/Raw/UT/TightDigits" );
+    //std::cout<<exists<MCHits>( m_spillPaths[iSpill] );
+    StatusCode sc = Transformer::initialize();
+    if ( sc.isFailure() ) std::cout<<"initialize is failed"<<std::endl;
+    else std::cout<<"initialize is OK"<<std::endl;
+    std::string check;
+    std::cout<<" ===>>> "<<this->hasProperty("UTHitsLinkLocation")<<std::endl;
+    if (this->hasProperty("UTHitsLinkLocation")){
+	 std::cout<<"*** = "<<this->getProperty( "UTHitsLinkLocation").toString()<<std::endl;
+	 updateHandleLocation( *this, "UTHitsLinkLocation", "/Event/Link/Raw/UT/TightDigits" );
+	 DataObjectReadHandle<LHCb::LinksByKey> m_xxx{this, "UTHitsLinkLocation", "/Event/Link/Raw/UT/TightDigits" };
+    }
+#  if 0
+    try{
+	 this->getProperty( "UTHitsLinkLocation", check );
+	 std::cout<<check<<std::endl;
+	 std::cout<<this->getProperty( "UTHitsLinkLocation").toString()<<std::endl;
+	 DataObjectReadHandle<LHCb::LinksByKey> m_xxx{this, "UTHitsLinkLocation", "/Event/Link/Raw/UT/TightDigits" };
+    } catch (...){}
+    //DataObjectReadHandle<LHCb::LinksByKey> m_xxx{this, "ODINLocation", LHCb::ODINLocation::Default};
+    std::cout<<"====="<<std::endl;
+#  endif
+
+#  if 0
+    try{
+    this->getProperty( "UTHitsLinkLocation" );
+    } catch (...){}
+#  endif
+#endif
+  }
 
   LHCb::LinksByKey operator()( const LHCb::MCParticles& mcParts, const ContainerType&... clusters,
                                const LinksByKeyT<ContainerType>&... links ) const override {