Merge pull request #185 from brownd1978/merge

Add collections from merged paths

Author: sophiemiddleton

examples/nominal_example.fcl

@@ -22,7 +22,7 @@ physics.analyzers.Mu2eEventDisplay.showCRV : true
 physics.analyzers.Mu2eEventDisplay.showPS : false
 physics.analyzers.Mu2eEventDisplay.showTS : false
 physics.analyzers.Mu2eEventDisplay.showDS : false
-physics.analyzers.Mu2eEventDisplay.addCRVBars : true
+physics.analyzers.Mu2eEventDisplay.addCRVBars : false
 physics.analyzers.Mu2eEventDisplay.addKalInter : true
 physics.analyzers.Mu2eEventDisplay.addCrystalHits : true
 physics.analyzers.Mu2eEventDisplay.filler.addHelixSeeds : false

fcl/prolog.fcl

@@ -59,7 +59,8 @@ REveDis : {
   producers: {
       MergeKK : {
         module_type : MergeKalSeeds
-        KalSeedCollections : ["KKDeM", "KKDeP", "KKUeM", "KKUeP", "KKDmuM", "KKDmuP", "KKUmuM", "KKUmuP", "KKLine", "KKOffSpill" ]
+        KalSeedCollections : ["KKDeM", "KKDeP", "KKUeM", "KKUeP", "KKDmuM", "KKDmuP", "KKUmuM", "KKUmuP", "KKLine", "KKCentralHelix",
+                           "KKDe", "KKUe", "KKDmu", "KKUmu" ]
       }
   }
   filters : {

src/REveMu2eDataInterface.cc

@@ -885,8 +885,9 @@ void REveMu2eDataInterface::FillKinKalTrajectory(REX::REveManager *&eveMng, bool
     if(seedcol!=0){
       for(auto const& kseedptr : *seedcol){
         auto const& kseed = *kseedptr;
+        unsigned nhits = kseed.hits().size();
         unsigned nactive =0;
-        for (auto const& hit : kseed.hits()){ if (hit.strawHitState() >= WireHitState::inactive) ++nactive; }
+        for (auto const& hit : kseed.hits()){ if (hit.strawHitState() > WireHitState::inactive) ++nactive; }
         // use t0 to define the reference segment
         double t0;
         kseed.t0Segment(t0);
@@ -905,7 +906,7 @@ void REveMu2eDataInterface::FillKinKalTrajectory(REX::REveManager *&eveMng, bool
             << "cx "  << lh.cx() << " mm "
             << "cy "  << lh.cy() << " mm "
             << "phi0 "  << lh.phi0() << " rad " << std::endl
-            << "N hits " <<  nactive << " fit cons. " << kseed.fitConsistency() << std::endl;
+            << "N hits (,active)" <<  nhits << "," << nactive << " fit cons. " << kseed.fitConsistency() << std::endl;
           //   << "track arrival time " << t1 << std::endl;
           AddKinKalTrajectory<LHPT>(trajectory,scene,j, ksstream.str(), t1, t2);
           if(addTrkHits) AddTrkStrawHit<LHPT>(kseed, scene, trajectory);

src/REveMu2eMainWindow.cc

@@ -356,7 +356,7 @@ void REveMu2eMainWindow::GeomDrawerNominal(TGeoNode* node, REX::REveTrans& trans
 }
 
 void REveMu2eMainWindow::GeomDrawerExtracted(TGeoNode* node, REX::REveTrans& trans, REX::REveElement* beamlineholder, REX::REveElement* trackerholder, REX::REveElement* caloholder, REX::REveElement* crystalsholder, REX::REveElement* crvholder, REX::REveElement* targetholder, int maxlevel, int level, GeomOptions geomOpt, std::vector<std::pair<std::string, std::vector<float>>>& offsets){
-    double x_crvex = 0; double y_crvex = 0;  double z_crvex = 0; double x_crvt1 = 0; double y_crvt1 = 0;  double z_crvt1 = 0; double x_crvt2 = 0; double y_crvt2 = 0;  double z_crvt2 = 0; 
+    double x_crvex = 0; double y_crvex = 0;  double z_crvex = 0; double x_crvt1 = 0; double y_crvt1 = 0;  double z_crvt1 = 0; double x_crvt2 = 0; double y_crvt2 = 0;  double z_crvt2 = 0;
     for(unsigned int i = 0; i < offsets.size(); i++){
       if(offsets[i].first.find("World") != string::npos){
         x_world = offsets[i].second[0];
@@ -426,7 +426,7 @@ void REveMu2eMainWindow::GeomDrawerExtracted(TGeoNode* node, REX::REveTrans& tra
       }
     }
     // everything else needs to be shifted such that its relative to the tracker center at 0,0,0
-    
+
     if(geomOpt.showCalo){
         static std::vector <std::string> substrings_disk  {"caloDisk"};
         for(auto& i: substrings_disk){
@@ -446,7 +446,7 @@ void REveMu2eMainWindow::GeomDrawerExtracted(TGeoNode* node, REX::REveTrans& tra
       }
     }
   if(geomOpt.showCRV and geomOpt.extracted){
-   
+
     static std::vector <std::string> substrings_ex {"CRSmotherLayer_CRV_EX"};
     shift.at(0) = x_crvex - x_trk;
     shift.at(1) = y_crvex - y_trk;
@@ -460,7 +460,7 @@ void REveMu2eMainWindow::GeomDrawerExtracted(TGeoNode* node, REX::REveTrans& tra
     shift.at(0) = x_crvt1 - x_trk;
     shift.at(1) = y_crvt1 - y_trk;
     shift.at(2) = z_crvt1 - z_trk;
-  
+
     for(auto& i: substrings_t1){
       showNodesByName(node,i,kFALSE, 0, trans, crvholder, maxlevel, level,  false, false, shift, false, true, drawconfigf.getInt("CRVColor"));
     }