Changeset 110821a in git

Timestamp:

Nov 21, 2014, 10:39:38 PM (10 years ago)

Author:

Christophe Delaere <christophe.delaere@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f185c24

Parents:

cf4a208

Message:

Display the full geometry next to the eventdisplay

Next step would be to display it directly in the eve window.

Files:

• display/Delphes3DGeometry.cc (modified) (2 diffs)
• display/Delphes3DGeometry.h (modified) (1 diff)
• display/DelphesEventDisplay.cc (modified) (1 diff)
• examples/EventDisplay.C (modified) (1 diff)

display/Delphes3DGeometry.cc

@@ -42 +42 @@
 using namespace std;
 
-Delphes3DGeometry::Delphes3DGeometry(TGeoManager *geom) {
+Delphes3DGeometry::Delphes3DGeometry(TGeoManager *geom, bool transp) {
 
    //--- the geometry manager
@@ -51 +51 @@
    TGeoMaterial *matVacuum = new TGeoMaterial("Vacuum", 0,0,0);
    TGeoMaterial *matAl = new TGeoMaterial("Al", 26.98,13,2.7); // placeholder
-   matVacuum->SetTransparency(85);
-   matAl->SetTransparency(85);
+   if(transp) {
+     matVacuum->SetTransparency(85);
+     matAl->SetTransparency(85);
+   }
 
    //--- define some media

display/Delphes3DGeometry.h

@@ -35 +35 @@
 class Delphes3DGeometry {
    public:
-     Delphes3DGeometry(TGeoManager *geom = NULL);
+     Delphes3DGeometry(TGeoManager *geom = NULL, bool transp = false);
      ~Delphes3DGeometry() {}
 

display/DelphesEventDisplay.cc

@@ -415 +415 @@
    browser->SetTabTitle("Event Control", 0);
 
+   // Geometry tab
+   // TODO add a tab with the full geometry
+   
    // the summary tab
    htmlSummary_ = new DelphesHtmlSummary("Delphes Event Display Summary Table");

examples/EventDisplay.C

@@ -15 +15 @@
 
    // create the detector representation
-   Delphes3DGeometry det3D(new TGeoManager("delphes", "Delphes geometry"));
+   Delphes3DGeometry det3D(new TGeoManager("delphes", "Delphes geometry"), true);
    det3D.readFile(configfile, ParticlePropagator, TrackingEfficiency, MuonEfficiency, Calorimeters);
 
    // create the application
    DelphesEventDisplay* display = new DelphesEventDisplay(configfile, datafile, det3D);
+
+   // another view of the geometry, in another window and without transparency
+   Delphes3DGeometry det3D_geom(new TGeoManager("delphes", "Delphes geometry"), false);
+   det3D_geom.readFile(configfile, ParticlePropagator, TrackingEfficiency, MuonEfficiency, Calorimeters);
+   new TCanvas;
+   det3D_geom.getDetector()->Draw();
 }