changed printout

[u/mrichter/AliRoot.git] / TGeant4 / TG4MaterialsFrames.cxx

diff --git a/TGeant4/TG4MaterialsFrames.cxx b/TGeant4/TG4MaterialsFrames.cxx
index 3a8a5be755a857a07e51307ea9d1b0a9b401c3ec..67cf54cd6ddea452c4ae68ad9465e451cf8dee05 100644 (file)
--- a/TGeant4/TG4MaterialsFrames.cxx
+++ b/TGeant4/TG4MaterialsFrames.cxx
@@ -17,6 +17,7 @@
 #include <TGTextEntry.h>
 #include <TGComboBox.h>
 #include <TGLabel.h>
+#include <TGTab.h>
  
 #include <G4Material.hh>
 #include <G4Element.hh>
@@ -25,11 +26,14 @@
 
  ClassImp(TG4MaterialsFrames)
 
-TG4MaterialsFrames::TG4MaterialsFrames( TGCompositeFrame* Parent, TGMainFrame* ActionFrame )
+TG4MaterialsFrames::TG4MaterialsFrames( TGTab* Tab, TGMainFrame* ActionFrame )
 { 
 //---> creates the materials properties display frame
 //---> and plunges it into the main frame
-   fCapFrame = new TGCompositeFrame(Parent, 60, 20, kHorizontalFrame);
+   TGCompositeFrame* parent = Tab->AddTab("Materials Properties");
+   fCapFrame = new TGCompositeFrame(parent, 60, 20, kHorizontalFrame);
+   ULong_t back= TGFrame::GetBlackPixel(); 
+   fCapFrame->ChangeBackground(back);   
    fMatSubframe1 = new TGCompositeFrame(fCapFrame, 60, 20, kVerticalFrame);
    fMatFrameLayout = new TGLayoutHints(kLHintsTop | kLHintsLeft, 5, 5, 5, 5);
 
@@ -86,7 +90,7 @@ TG4MaterialsFrames::TG4MaterialsFrames( TGCompositeFrame* Parent, TGMainFrame* A
      fCapFrame->AddFrame(fMatSubframe2,fMatFrameLayout);
 
 // going to the main frame     
-     Parent->AddFrame(fCapFrame, fMatFrameLayout);   
+     parent->AddFrame(fCapFrame, fMatFrameLayout);   
    
 }
 
@@ -179,9 +183,9 @@ void TG4MaterialsFrames::DisplayMaterialCharacteristics()
      G4cout << lvMaterial->GetName() << "  "
            << lvMaterial->GetNumberOfElements() << "  "
            << (*allElements )[0]->GetName() << "...  "
-           << lvMaterial->GetDensity() << "  "
+           << lvMaterial->GetDensity()/(g/cm3) << "  "
            << lvMaterial->GetState() << "  "
-           << lvMaterial->GetRadlen() << "  "
+           << lvMaterial->GetRadlen()/(cm) << "  "
            << G4endl;
          
    char buff[200];
@@ -209,12 +213,12 @@ void TG4MaterialsFrames::DisplayMaterialCharacteristics()
 
     sprintf(buff, " Multi element material" );
     if( noe < 2 )
-        sprintf(buff, "%10.2e", lvMaterial->GetA() );
+        sprintf(buff, "%10.2e", lvMaterial->GetA()/(g) );
     fMatTextBuff[3]->Clear();
     fMatTextBuff[3]->AddText(0, buff);
     gClient->NeedRedraw(fMatTextEntry[3]);
     
-    sprintf(buff, "%10.2e", lvMaterial->GetDensity() );
+    sprintf(buff, "%10.2e", lvMaterial->GetDensity()/(g/cm3) );
     fMatTextBuff[4]->Clear();
     fMatTextBuff[4]->AddText(0, buff);
     gClient->NeedRedraw(fMatTextEntry[4]);
@@ -224,7 +228,7 @@ void TG4MaterialsFrames::DisplayMaterialCharacteristics()
     fMatTextBuff[5]->AddText(0, buff);
     gClient->NeedRedraw(fMatTextEntry[5]);
     
-    sprintf(buff,"%10.2e", lvMaterial->GetRadlen());
+    sprintf(buff,"%10.2e", lvMaterial->GetRadlen()/(cm));
     fMatTextBuff[6]->Clear();
     fMatTextBuff[6]->AddText(0, buff);
     gClient->NeedRedraw(fMatTextEntry[6]);