Changeset 5 in Idarraga for SLHCVP1TrackVis

Timestamp:

Nov 24, 2010, 6:15:51 PM (14 years ago)

Author:

idarraga

Message:

 

Location:

SLHCVP1TrackVis/SLHCVP1Systems/src

Files:

• SLHCVP1DrawPixels.cxx (added)
• SLHCVP1TraceTracks.cxx (modified) (3 diffs)
• SLHCVP1TraceTruth.cxx (modified) (4 diffs)
• SLHCVP1TrackSystem.cxx (modified) (6 diffs)

SLHCVP1TrackVis/SLHCVP1Systems/src/SLHCVP1TraceTracks.cxx

@@ -22 +22 @@
 
 void SLHCVP1TrackSystem::TraceTracks(const TrackCollection * trackColl, SoSeparator * root){
+
+        // A separator for the labels
+        SoSeparator * tracksSep = new SoSeparator;
 
         TrackCollection::const_iterator trackItr, trackItrEnd = trackColl->end();
@@ -65 +68 @@
 
                 sw->addChild(line);
-                root->addChild(sw);
+                tracksSep->addChild(sw);
 
                 //Bookkeep which track this 3D object corresponds to (we will need this to display track info when the user clicks):
@@ -71 +74 @@
 
                 //To avoid GUI freeze-ups:
-                updateGUI();
+                //updateGUI();
         }
 
-
+        root->addChild(tracksSep);
 }

SLHCVP1TrackVis/SLHCVP1Systems/src/SLHCVP1TraceTruth.cxx

@@ -45 +45 @@
 
         // A separator for the labels
-        SoGroup * textGroup = new SoGroup;
-        textGroup->ref();
+        SoSeparator * textGroup = new SoSeparator;
 
         // Get the GenEvent
@@ -118 +117 @@
 
                         // 2D text, added to a Separator.
-
                         SoTranslation * trans = new SoTranslation;
                         CalcTranslation(endx, endy, endz);
@@ -132 +130 @@
                         textGroup->addChild(text);
 
-                        //To avoid GUI freeze-ups:
-                        updateGUI();
-                        nParticles++;
-
                         // Store this new position, is going to be the old one
                         // in the next iteration
@@ -141 +135 @@
                         m_translationArray[_TRANS_INFO_X1][_TRANS_ARR_Y] = endy;
                         m_translationArray[_TRANS_INFO_X1][_TRANS_ARR_Z] = endz;
+                        nParticles++;
+
                 }
 

SLHCVP1TrackVis/SLHCVP1Systems/src/SLHCVP1TrackSystem.cxx

@@ -26 +26 @@
 #include "HepMC/GenVertex.h"
 
+#include "InDetSimEvent/SiHitCollection.h"
 #include "GeneratorObjects/McEventCollection.h"
 
@@ -37 +38 @@
         //declareProperty("McEventCollectionKey", m_McEventCollectionKey="TruthEvent");
         m_McEventCollectionKey="TruthEvent";
+        m_SiHitCollKey= "PixelHits";
+        m_SiClusterContKey = "PixelClusters";
 
         // Only for plotting purposes.  End point of non decaying particles.
@@ -69 +72 @@
         const TrackCollection *trackColl;
         std::string trackname="Tracks";
-        StatusCode status1 = sg->retrieve(trackColl, trackname);
-        if (status1 != StatusCode::SUCCESS || !trackColl) {
+        StatusCode status = sg->retrieve(trackColl, trackname);
+        if (status != StatusCode::SUCCESS || !trackColl) {
                 message("Error: Could not retrieve track collection (used key="+QString(trackname.c_str())+")");
         }else{
@@ -80 +83 @@
         //sg->dump(); <-- don't call StoreGate::dump() here, VP1 freaks out, why ?
         const McEventCollection * McEventColl;
-        StatusCode status2 = sg->retrieve(McEventColl, m_McEventCollectionKey);
-        if (status2 != StatusCode::SUCCESS || !McEventColl) {
+        status = sg->retrieve(McEventColl, m_McEventCollectionKey);
+        if (status != StatusCode::SUCCESS || !McEventColl) {
                 message("Could not find the McEventCollection");
         }else{
                 TraceTruth(McEventColl, root);
         }
+
+        /////////////////////////////////////////////////////////////////////////
+        // Pixels, hits and clusters
+        const SiHitCollection * SiHitColl;
+        const InDet::SiClusterContainer * SiClusterCont;
+
+        status = sg->retrieve(SiHitColl, m_SiHitCollKey);
+        StatusCode status2 = sg->retrieve(SiClusterCont, m_SiClusterContKey);
+
+        if (status != StatusCode::SUCCESS || !SiHitColl || status2 != StatusCode::SUCCESS || !SiClusterCont) {
+                message("Could not find the SiHitCollection or SiClusterContainer");
+        }else{
+                DrawPixels(SiHitColl, SiClusterCont, root);
+        }
+
+        //To avoid GUI freeze-ups:
+        updateGUI();
 
         return;
@@ -155 +175 @@
 
         switch(TMath::Abs(pdgid)) {
+        case(0):
+                string = "(*)";
+                break;
         case(11):
                 string = "e(11)";
@@ -171 +194 @@
                 break;
         case(211):
-                string = "pi+/-";
+                string = "pi+";
+                break;
+        case(-211):
+                string = "pi-";
                 break;
         default: