Enable creation of fast rec points for ITS, when input argument for ITS = 2.

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

diff --git a/TGeant4/TG4MaterialsFrames.cxx b/TGeant4/TG4MaterialsFrames.cxx
index 7953dd7a7b304839bce1723cd5a5473e99e4f0ce..2e9209706c762e9465e7a0d1eb5049e231f9b8af 100644 (file)
--- a/TGeant4/TG4MaterialsFrames.cxx
+++ b/TGeant4/TG4MaterialsFrames.cxx
@@ -30,8 +30,8 @@ TG4MaterialsFrames::TG4MaterialsFrames( TGTab* Tab, TGMainFrame* ActionFrame )
 { 
 //---> creates the materials properties display frame
 //---> and plunges it into the main frame
-   TGCompositeFrame* Parent = Tab->AddTab("Materials Properties");
-   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);
@@ -48,7 +48,7 @@ TG4MaterialsFrames::TG4MaterialsFrames( TGTab* Tab, TGMainFrame* ActionFrame )
    fMatSubframe1->AddFrame(fMaterialsCombo, fMatFrameLayout);
 
 
-   fMaterialsCombo->Resize(200, 20);
+   fMaterialsCombo->Resize(200, 30);
    fMaterialsCombo->Associate(ActionFrame); 
 
 
@@ -90,7 +90,7 @@ TG4MaterialsFrames::TG4MaterialsFrames( TGTab* Tab, TGMainFrame* ActionFrame )
      fCapFrame->AddFrame(fMatSubframe2,fMatFrameLayout);
 
 // going to the main frame     
-     Parent->AddFrame(fCapFrame, fMatFrameLayout);   
+     parent->AddFrame(fCapFrame, fMatFrameLayout);   
    
 }
 
@@ -140,7 +140,7 @@ void TG4MaterialsFrames::SetMaterialsComboEntries()
 
    const G4MaterialTable* lComboEntries = G4Material::GetMaterialTable();
 
-    G4int ig = lComboEntries->entries();
+    G4int ig = lComboEntries->size();
     G4String name;
     
     for (int ii=0; ii < ig; ii++)
@@ -163,14 +163,22 @@ void TG4MaterialsFrames::AddMaterialName( const char* name, Int_t index) const
    fMaterialsCombo->Resize(200, 20);
 }
 
-void TG4MaterialsFrames::DisplayMaterialCharacteristics()
+void TG4MaterialsFrames::DisplayMaterialCharacteristics( int qmat)
 {
   
-//-----> shows informations about materials listed in G4MaterialTable 
+//---> shows informations about materials listed in G4MaterialTable
+//---> qmat eq 0 means clicking in the MaterialsFrames ComboBox
+//---> qmat gt 0 means clicking in the VolumesFrames ComboBox
 
    const G4MaterialTable* lComboEntries = G4Material::GetMaterialTable();
-   G4int ientr = lComboEntries->entries();
-   G4int index = fMaterialsCombo->GetSelected();
+   G4int ientr = lComboEntries->size();
+   G4int index = qmat ;
+   
+   if ( !(qmat < 1) )
+        fMaterialsCombo->Select( index );
+   
+   if ( qmat < 1 )
+        index = fMaterialsCombo->GetSelected();
    
    G4cout << "\nThe clicked-on material has the index:  " << index << G4endl;
    
@@ -183,20 +191,21 @@ void TG4MaterialsFrames::DisplayMaterialCharacteristics()
      G4cout << lvMaterial->GetName() << "  "
            << lvMaterial->GetNumberOfElements() << "  "
            << (*allElements )[0]->GetName() << "...  "
-           << lvMaterial->GetDensity()/(g/cm3) << "  "
+           << lvMaterial->GetDensity()/(g/cm3) << "(g/cm3)  "
            << lvMaterial->GetState() << "  "
-           << lvMaterial->GetRadlen()/(cm) << "  "
+           << lvMaterial->GetRadlen()/(cm) << "(cm)  "
            << G4endl;
          
    char buff[200];
+   G4String line = " ";
    
-    sprintf(buff, "%10i",index );
+    sprintf(buff, "%12i",index );
     fMatTextBuff[0]->Clear();
     fMatTextBuff[0]->AddText(0, buff);
     gClient->NeedRedraw(fMatTextEntry[0]);
     
     G4int noe = lvMaterial->GetNumberOfElements();
-    sprintf(buff, "%10i", noe);
+    sprintf(buff, "%12i", noe);
     fMatTextBuff[1]->Clear();
     fMatTextBuff[1]->AddText(0, buff);
     gClient->NeedRedraw(fMatTextEntry[1]);
@@ -211,27 +220,37 @@ void TG4MaterialsFrames::DisplayMaterialCharacteristics()
     fMatTextBuff[2]->AddText(0, buff);
     gClient->NeedRedraw(fMatTextEntry[2]);
 
-    sprintf(buff, " Multi element material" );
+    sprintf(buff, "   Multi element material" );
+    if( noe < 2 )
+        sprintf(buff, "%12.5e", lvMaterial->GetA()/(g) );
+    line += buff;
     if( noe < 2 )
-        sprintf(buff, "%10.2e", lvMaterial->GetA()/(g) );
+         line += "   (g)";
     fMatTextBuff[3]->Clear();
-    fMatTextBuff[3]->AddText(0, buff);
+    fMatTextBuff[3]->AddText(0, line);
     gClient->NeedRedraw(fMatTextEntry[3]);
+    line = " ";
     
-    sprintf(buff, "%10.2e", lvMaterial->GetDensity()/(g/cm3) );
+    sprintf(buff, "%12.5e", lvMaterial->GetDensity()/(g/cm3) );
+    line += buff;
+    line += "   (g/cm3)";
     fMatTextBuff[4]->Clear();
-    fMatTextBuff[4]->AddText(0, buff);
+    fMatTextBuff[4]->AddText(0, line);
     gClient->NeedRedraw(fMatTextEntry[4]);
+    line = " ";
     
-    sprintf(buff,"%10i", lvMaterial->GetState());
+    sprintf(buff,"%12i", lvMaterial->GetState());
     fMatTextBuff[5]->Clear();
     fMatTextBuff[5]->AddText(0, buff);
     gClient->NeedRedraw(fMatTextEntry[5]);
     
-    sprintf(buff,"%10.2e", lvMaterial->GetRadlen()/(cm));
+    sprintf(buff,"%12.5e", lvMaterial->GetRadlen()/(cm));
+    line += buff;
+    line += "  (cm)";    
     fMatTextBuff[6]->Clear();
-    fMatTextBuff[6]->AddText(0, buff);
+    fMatTextBuff[6]->AddText(0, line);
     gClient->NeedRedraw(fMatTextEntry[6]);
+    line = " ";
     
     sprintf(buff, "           " );
     fMatTextBuff[7]->Clear();