Changeset 261 in Idarraga

Timestamp:

Nov 21, 2011, 7:07:58 PM (13 years ago)

Author:

idarraga

Message:

 

Location:

allpix

Files:

• allpix.cc (modified) (1 diff)
• include/AllPixDetectorConstruction.hh (modified) (2 diffs)
• include/AllPixRun.hh (modified) (3 diffs)
• macros/oneDetector_Inventor_vis.in (modified) (1 diff)
• macros/telescope1_Inventor_vis.in (modified) (1 diff)
• src/AllPixRun.cc (modified) (3 diffs)
• src/AllPixRunAction.cc (modified) (1 diff)

allpix/allpix.cc

@@ -138 +138 @@
         // Hits ! --> Ntuple to store hits
         // creates AllPixRun to analyze hits at the end of event
-        TString dataset = "AllPix";
+        TString dataset = "allPix";
         TString tempdir = "";
         AllPixRunAction * run_action = new AllPixRunAction(detector, dataset, tempdir,

allpix/include/AllPixDetectorConstruction.hh

@@ -42 +42 @@
 #include "G4Colour.hh"
 #include "G4PVDivision.hh"
+#include "G4VSolid.hh"
 
 #include "AllPixTrackerSD.hh"
@@ -110 +111 @@
   void SetOutputFilePrefix(G4String);
   G4String GetOutputFilePrefix(){return m_outputFilePrefix;};
+
+  G4VSolid * GetVSolidDetector (G4int detId) {
+          // Check first if the detId is good
+          // otherwise return null pointer
+          return m_Box_log[detId]->GetSolid();
+  };
 
         // Specific EUTelescope

allpix/include/AllPixRun.hh

@@ -31 +31 @@
 class WriteToNtuple;
 class SimpleHits;
+class AllPixDetectorConstruction;
 
 #ifdef _EUTELESCOPE
@@ -40 +41 @@
 public:
 
-  AllPixRun(TString, TString, TString);
+  AllPixRun(AllPixDetectorConstruction *, TString, TString, TString);
   virtual ~AllPixRun();
 
@@ -54 +55 @@
 private:
 
+  AllPixDetectorConstruction * m_detectorPtr;
   AllPixTrackerHitsCollection * m_hitsCollection;
 

allpix/macros/oneDetector_Inventor_vis.in

@@ -98 +98 @@
 /gps/source/list
 
-/run/beamOn 2
+/run/beamOn 1
 
 # video

allpix/macros/telescope1_Inventor_vis.in

@@ -162 +162 @@
 #/vis/open OGLIQt
 #/vis/open OGLSQt
-#/vis/open OIX
-/vis/open OGLIX 1024x768-100+100
+/vis/open OIX
+#/vis/open OGLIX 1024x768-100+100
 #/vis/open OGLSXm
 #/vis/open DAWNFILE

allpix/src/AllPixRun.cc

@@ -9 +9 @@
 #include "G4SDManager.hh"
 #include "G4DigiManager.hh"
+#include "G4Trajectory.hh"
 
 // digits, frames
@@ -29 +30 @@
  * This constructor is called once per run
  */
-AllPixRun::AllPixRun(TString ofp, TString dataset, TString tempDir){
+AllPixRun::AllPixRun(AllPixDetectorConstruction * det, TString ofp, TString dataset, TString tempDir){
+
+        m_detectorPtr = det;
 
         // Call for an instance to write.  Need to know how
@@ -387 +390 @@
         *m_lciobridge_dut_f << "R " << GetRunID() << endl;
 
+        // check event for information about the track
+        //G4TrajectoryContainer * tC = evt->GetTrajectoryContainer();
+        //G4Trajectory * tr;
+        G4TrajectoryContainer * tC = evt->GetTrajectoryContainer();
+        G4cout << "Trajectories : " << tC->GetVector()->size() << G4endl;
+        TrajectoryVector * tV = tC->GetVector();
+        TrajectoryVector::iterator tI = tV->begin();
+        TrajectoryVector::iterator tIE = tV->end();
+
+        G4Trajectory * tr;
+        G4TrajectoryPoint* tP;
+        for ( ; tI != tIE ; tI++ ) {
+                tr = static_cast<G4Trajectory*>(*tI);
+                //G4cout << "    " << tr->GetPDGEncoding() << G4endl;
+                //G4cout << "       " << tr->GetPointEntries() << G4endl;
+                tP = static_cast<G4TrajectoryPoint*>((*tI)->GetPoint(0));
+
+                // Check which of the points is at the interior of the sensor
+                // Use the G4VSolid::Inside(const G4ThreeVector& p)
+                // Find first the Silicon G4VSolids (sensors).
+
+
+                //G4VSolid * sol = m_detectorPtr->GetVSolidDetector(100);
+                //G4cout << "       " << tP->GetPosition().z()/mm << G4endl;
+/*
+                if(sol->Inside(tP->GetPosition()) == kInside){
+                        G4cout << "       inside !!" << G4endl;
+                } else {
+                        G4cout << "       outside !!" << G4endl;
+                }
+*/
+        }
+
         // Ok, I have to match the right detector m_frames with the digit collection
         for (G4int i = 0 ; i < nDC ; i++) {

allpix/src/AllPixRunAction.cc

@@ -83 +83 @@
 G4Run * AllPixRunAction::GenerateRun(){
 
-        m_AllPixRun = new AllPixRun(m_detectorPtr->GetOutputFilePrefix(), m_dataset, m_tempdir); // keep this pointer
+        m_AllPixRun = new AllPixRun(m_detectorPtr, m_detectorPtr->GetOutputFilePrefix(), m_dataset, m_tempdir); // keep this pointer
         m_AllPixRun->SetLCIOBridgeFileDsc(m_lciobridge_f, m_lciobridge_dut_f);