]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - RICH/RichConfig.C
Writing the ESDfriends to a separate branch of the ESD tree.
[u/mrichter/AliRoot.git] / RICH / RichConfig.C
index 34a8148ece2624a68ac949a0e6a600a6317dc76d..06b29c282b78e7032a6c484fa0d497203b039b19 100644 (file)
@@ -8,11 +8,11 @@ public:
          ~RichConfig()                    {Info("ctor","");Cleanup();}
          
   enum EVersOpts  {kNo=101,kVer0,kVer1,kVer2,kTest, kDeclust=301,kSagita,kFeedback,kSecRad,kQe0=400,kQeNorm,kOptics};
-  enum EGenTypes  {kGunZ=1,kGun1,kGun7,kBox1,kBox7,kHijing,kHijingPara,kPythia,kRichLib,kNotUsed=999};
+  enum EGenTypes  {kGunZ=1,kGun1,kGun7,kBox,kHijing,kHijingPara,kPythia,kRichLib,kNotUsed=999};
   
   enum EDetectors {kPIPE=1,kITS,kTPC,kTRD,kTOF,kFRAME,kMAG,kCRT,kHALL,kPHOS,kSTART,kFMD,kABSO,kPMD,kDIPO,kEMCAL,kVZERO,kMUON,kZDC,kSHILD};
   enum EProcesses {kDCAY=1,kPAIR,kCOMP,kPHOT,kPFIS,kDRAY,kANNI,kBREM,kMUNU,kCKOV,kHADR,kLOSS,kMULS,kRAYL,kALL};
-  enum EBatchFlags{kPrim=555,kTransport,kAll,kOnly,kRawDdl,kRawDate,kRawRoot,kVertex,kTrack,kEsd};
+  enum EBatchFlags{kPrim=555,kTransport,kAll,kOnly,kRawDdl,kRawDate,kRawRoot,kVertex,kTrack,kHlt,kEsd,kAlign};
   enum EMagField  {kFld0,kFld2,kFld4,kFld5,kFld_2,kFld_4,kFld_5};
   
   Float_t Eta2Theta      (Float_t arg)  const{return (180./TMath::Pi())*2.*TMath::ATan(TMath::Exp(-arg));}
@@ -21,13 +21,14 @@ public:
   void GuiPhys (TGHorizontalFrame *pMainF);  void WritePhys (FILE *pF);  void PhysAddSlot(Int_t id); void PhysRemSlot(Int_t id);
   void GuiGen  (TGCompositeFrame  *pMainF);  void WriteGen  (FILE *pF);  void GenAddSlot (Int_t id); void GenRemSlot (Int_t id);
   void GuiDet  (TGHorizontalFrame *pMainF);  void WriteDet  (FILE *pF);  void DetAddSlot (Int_t id); void DetRemSlot (Int_t id);
-  void GuiBatch(TGHorizontalFrame *pMainF);  void WriteBatch(        );
+  void GuiBatch(TGHorizontalFrame *pMainF);  void WriteBatch(        );  void SlotBatch  (Int_t id);
   
   void    WriteConfig();
   void    ExitSlot();
      
   TGButtonGroup *fVerBG,*fOptBG,*fQeBG; //Rich widgets  
-  TGButtonGroup *fMagBG;                //magnet field widgets
+  TGButtonGroup *fMagBG;                //mag field widgets   
+  TGButton      *fDecayerB;             //external decayer widgets
   
   TGComboBox        *fGenPidCO,*fGenPminCO,*fGenPmaxCO,*fGenChamCO,*fGenNprimCO; //generator widgets combos
   TGCompositeFrame  *fGenF;                                                     //generator widgets frames     
@@ -38,15 +39,13 @@ public:
 
    char         *fFileName;
 };//class RichConfig
-//__________________________________________________________________________________________________    
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 RichConfig::RichConfig(const char *sFileName):TGMainFrame(gClient->GetRoot(),700,400)
 {
   fFileName=sFileName;
 
   AddFrame(pMainF=new TGHorizontalFrame(this,100,200)); //main horizontal frame
   
-// Magnetic Field
-  
   GuiRich (pMainF);
   GuiGen  (pMainF);   
   GuiDet  (pMainF);
@@ -63,8 +62,8 @@ RichConfig::RichConfig(const char *sFileName):TGMainFrame(gClient->GetRoot(),700
   Resize(GetDefaultSize());
   SetWindowName("Create AliROOT scripts");
   MapWindow(); 
-}//KirCondig::ctor
-//__________________________________________________________________________________________________          
+}//ctor
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::GuiRich(TGHorizontalFrame *pMainHF)
 {
   pMainHF->AddFrame(pLeftVF=new TGVerticalFrame(pMainHF,100,200));  
@@ -84,6 +83,7 @@ void RichConfig::GuiRich(TGHorizontalFrame *pMainHF)
   pRichGF->AddFrame(fQeBG=new TGButtonGroup(pRichGF,""));
     new TGRadioButton(fQeBG,"QE=0"                 ,kQe0);       
     new TGRadioButton(fQeBG,"QE normal"            ,kQeNorm);       fQeBG->SetButton(kQeNorm);
+  pLeftVF->AddFrame(fDecayerB=new TGCheckButton(pLeftVF,"Puthia decayer On/Off"));  fDecayerB->SetState(kButtonDown);
   pLeftVF->AddFrame(fMagBG=new TGButtonGroup(pLeftVF,"Mag field")); 
     new TGRadioButton(fMagBG,   "0.5 T"      ,kFld5   ));
     new TGRadioButton(fMagBG,   "0.4 T"      ,kFld4   ));
@@ -93,29 +93,31 @@ void RichConfig::GuiRich(TGHorizontalFrame *pMainHF)
     new TGRadioButton(fMagBG,   "-0.4 T"     ,kFld_4  ));
     new TGRadioButton(fMagBG,   "-0.5 T"     ,kFld_5  ));
 }//Rich()
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::RichVerSlot(Int_t ver)  
 {
   if(ver==kTest)    {fMagBG->SetButton(kFld0); fGenBG->SetButton(kGunZ); }
 } 
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::WriteRich(FILE *pF)
 {
   if(!fVerBG->GetButton(kNo)->GetState()){
-    if( fOptBG->GetButton(kSecRad)->GetState())             fprintf(pF,"  AliRICHParam::fgIsSecondRadiator=kTRUE;\n");
+    TString title;
+    if( fOptBG->GetButton(kSecRad)->GetState())             title+=" Radiator2 ";
     if(!fOptBG->GetButton(kSagita)->GetState())             fprintf(pF,"  AliRICHParam::fgIsWireSagita=kFALSE;\n");
-    if( fOptBG->GetButton(kTest)  ->GetState())             fprintf(pF,"  AliRICHParam::fgIsTestBeam=kTRUE;\n");    
-    if( fOptBG->GetButton(kTest)  ->GetState())             fprintf(pF,"  AliRICHParam::fgIsOptDisp=kTRUE;\n");    
+    if( fOptBG->GetButton(kTest)  ->GetState())             title+=" TestBeam ";
+    if( fOptBG->GetButton(kOptics)->GetState())             title+=" ShowOptics ";
+    if(title.Length()==0) title="Default";
     
-    if     (fVerBG->GetButton(kVer0)->GetState())           fprintf(pF,"  AliRICH *pRICH=new AliRICHv0(\"Debug\");\n\n");    
-    else if(fVerBG->GetButton(kVer1)->GetState())           fprintf(pF,"  AliRICH *pRICH=new AliRICHv1(\"RICH\",\"Normal RICH\");\n\n");   
-    else if(fVerBG->GetButton(kVer2)->GetState())           fprintf(pF,"  AliRICH *pRICH=new AliRICHv2(\"New Rich\");\n\n");   
+    if     (fVerBG->GetButton(kVer0)->GetState())           fprintf(pF,"  new AliRICHv0(\"Gel %s\");\n\n",title.Data());    
+    else if(fVerBG->GetButton(kVer1)->GetState())           fprintf(pF,"  new AliRICHv1(\"RICH\",\"%s\");\n\n",title.Data());   
+    else if(fVerBG->GetButton(kVer2)->GetState())           fprintf(pF,"  new AliRICHv2(\"Tic %s\");\n\n",title.Data());   
   }
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::GuiPhys(TGHorizontalFrame *pMainHF)
 {
-  pMainHF->AddFrame(fProcBG=new TGButtonGroup(pMainHF,"Processes"));
+  pMainHF->AddFrame(fProcBG=new TGButtonGroup(pMainHF,"Procs"));
   fProcBG->Connect("Pressed(Int_t)" ,"RichConfig",this,"PhysAddSlot(Int_t)");
   fProcBG->Connect("Released(Int_t)","RichConfig",this,"PhysRemSlot(Int_t)");
     new TGCheckButton(fProcBG,"ALL  ON/OFF"                 ,kALL)) ;
@@ -134,21 +136,21 @@ void RichConfig::GuiPhys(TGHorizontalFrame *pMainHF)
     new TGCheckButton(fProcBG,"MULS Multiple scattering"    ,kMULS));  fProcBG->SetButton(kMULS);       
     new TGCheckButton(fProcBG,"RAYL Rayleigh scattering"    ,kRAYL));  fProcBG->SetButton(kRAYL);       
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::PhysAddSlot(Int_t id)
 {//slot is invoked when any of physics check button is pressed
   if(id==kALL)  //if the pressed check button is kALL then switch on all the buttons 
     for(int i=1;i<=fProcBG->GetCount();i++) 
       fProcBG->SetButton(i,kButtonDown);
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void  RichConfig::PhysRemSlot(Int_t id)
 {//slot is invoked when any of physics check button is released
   if(id==kALL) //if the released check button is kALL then switch off all the buttons 
     for(int i=1;i<=fProcBG->GetCount();i++) 
       fProcBG->SetButton(i,kButtonUp);
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::WritePhys(FILE *pF)
 {
   if(fProcBG->GetButton(kDCAY)->GetState()) fprintf(pF,"  gMC->SetProcess(\"DCAY\",1);  ");else fprintf(pF,"  gMC->SetProcess(\"DCAY\",0);  ");
@@ -172,17 +174,16 @@ void RichConfig::WritePhys(FILE *pF)
   fprintf(pF,"  gMC->SetCut(\"BCUTM\" ,0.001);  "); fprintf(pF,"  gMC->SetCut(\"DCUTE\" ,0.001);  "); fprintf(pF,"  gMC->SetCut(\"DCUTM\" ,0.001);\n"); 
   fprintf(pF,"  gMC->SetCut(\"PPCUTM\",0.001);  "); fprintf(pF,"  gMC->SetCut(\"TOFMAX\",1e10);\n\n"); 
 }//WritePhys()
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::GuiGen(TGCompositeFrame *pMainF)
 {//generator configurator implemented as group of radio buttons
   pMainF->AddFrame(fGenF=new TGVerticalFrame(pMainF));//add generator vertical frame to horizontal main frame
-  fGenF->AddFrame(fGenBG=new TGButtonGroup(fGenF,"Generator"));//add type button group to vertical generator frame
+  fGenF->AddFrame(fGenBG=new TGButtonGroup(fGenF,"Gene"));//add type button group to vertical generator frame
   fGenBG->Connect("Pressed(Int_t)","RichConfig",this,"GenAddSlot(Int_t)"); fGenBG->Connect("Released(Int_t)","RichConfig",this,"GenRemSlot(Int_t)");
     new TGCheckButton(fGenBG,"gun along z"           ,kGunZ);
     new TGCheckButton(fGenBG,"gun to 1 chamber"      ,kGun1);
     new TGCheckButton(fGenBG,"gun to 7 chambers"     ,kGun7);
-    new TGCheckButton(fGenBG,"box to 1 chamber"      ,kBox1);  
-    new TGCheckButton(fGenBG,"box to 7 chambers"     ,kBox7);
+    new TGCheckButton(fGenBG,"box RICH phase space"  ,kBox );  
     new TGCheckButton(fGenBG,"HIJING"                ,kHijing);
     new TGCheckButton(fGenBG,"HIJING para"           ,kHijingPara);
     new TGCheckButton(fGenBG,"Pythia"                ,kPythia);
@@ -193,7 +194,10 @@ void RichConfig::GuiGen(TGCompositeFrame *pMainF)
   fGenNprimCO->AddEntry("N prim=1"    ,1);
   fGenNprimCO->AddEntry("N prim=2"    ,2);
   fGenNprimCO->AddEntry("N prim=5"    ,5);
-  fGenNprimCO->AddEntry("N prim=500"  ,5);
+  fGenNprimCO->AddEntry("N prim=100"  ,100);
+  fGenNprimCO->AddEntry("N prim=500"  ,500);
+  fGenNprimCO->AddEntry("N prim=1000" ,1000);
+  fGenNprimCO->AddEntry("N prim=10000",10000);
   fGenNprimCO->AddEntry("N prim=80000",80000);  fGenNprimCO->Resize(160,20);   fGenNprimCO->Select(kNotUsed);
 //PID    
   fGenF->AddFrame(fGenPidCO=new TGComboBox(fGenF,100)); //add pid combo to generator vertical frame
@@ -222,38 +226,29 @@ void RichConfig::GuiGen(TGCompositeFrame *pMainF)
   fGenChamCO->AddEntry("not used",kNotUsed);
   for(int i=1;i<=7;i++) fGenChamCO->AddEntry(Form("Chamber %i",i),i);  fGenChamCO->Resize(160,20); fGenChamCO->Select(kNotUsed);
 }//GuiGen()
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::GenAddSlot(Int_t id)
 {//is invoked when any of generator check button is pressed
   if(id==kGunZ){
-    fGenBG->GetButton(kGun1)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenNprimCO);
-    fGenBG->GetButton(kGun7)->SetEnabled(kFALSE);                                fGenPidCO->Select(kProton);
-    fGenBG->GetButton(kBox1)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenPmaxCO); fGenPminCO->Select(25);
-    fGenBG->GetButton(kBox7)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenChamCO); 
+    fGenBG->GetButton(kGun1)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenNprimCO); fGenF->HideFrame(fGenPmaxCO);
+    fGenBG->GetButton(kGun7)->SetEnabled(kFALSE);                                
+    fGenBG->GetButton(kBox )->SetEnabled(kFALSE);  fGenPidCO->Select(kProton);    fGenPminCO->Select(25);
   } 
   if(id==kGun1){
-    fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenNprimCO);
-    fGenBG->GetButton(kGun7)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenPmaxCO); 
-    fGenBG->GetButton(kBox1)->SetEnabled(kFALSE);  
-    fGenBG->GetButton(kBox7)->SetEnabled(kFALSE);  fGenPidCO->Select(kProton); fGenPminCO->Select(25); fGenChamCO->Select(4);
+    fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenNprimCO); fGenF->HideFrame(fGenPmaxCO); 
+    fGenBG->GetButton(kGun7)->SetEnabled(kFALSE);  fGenPidCO->Select(kProton);    fGenPminCO->Select(25); fGenChamCO->Select(4);
+    fGenBG->GetButton(kBox )->SetEnabled(kFALSE);  
   }
   if(id==kGun7){
     fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenNprimCO);
     fGenBG->GetButton(kGun1)->SetEnabled(kFALSE);                                fGenPidCO->Select(kProton); 
-    fGenBG->GetButton(kBox1)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenPmaxCO); fGenPminCO->Select(25);
-    fGenBG->GetButton(kBox7)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenChamCO); 
+    fGenBG->GetButton(kBox )->SetEnabled(kFALSE);  fGenF->HideFrame(fGenPmaxCO); fGenPminCO->Select(25);
+                                                   fGenF->HideFrame(fGenChamCO); 
   } 
-  if(id==kBox1){
-    fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE);                                fGenNprimCO->Select(1);
+  if(id==kBox){
+    fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE);                                fGenNprimCO->Select(500);
     fGenBG->GetButton(kGun1)->SetEnabled(kFALSE);                                fGenPidCO  ->Select(kProton);
-    fGenBG->GetButton(kGun7)->SetEnabled(kFALSE);                                fGenPminCO ->Select(5);        fGenPmaxCO->Select(25); 
-    fGenBG->GetButton(kBox7)->SetEnabled(kFALSE);                                fGenChamCO ->Select(4);
-  }
-  if(id==kBox7){
-    fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE);                                fGenNprimCO->Select(1);
-    fGenBG->GetButton(kGun1)->SetEnabled(kFALSE);                                fGenPidCO  ->Select(kProton); 
-    fGenBG->GetButton(kGun1)->SetEnabled(kFALSE);                                fGenPminCO ->Select(5);        fGenPmaxCO->Select(25);   
-    fGenBG->GetButton(kBox1)->SetEnabled(kFALSE);  fGenF->HideFrame(fGenChamCO);  
+    fGenBG->GetButton(kGun7)->SetEnabled(kFALSE);                                fGenPminCO ->Select(15);       fGenPmaxCO->Select(15); 
   }
   if(id==kHijing){
     fGenBG->GetButton(kHijing)->ChangeBackground(0xff0000);
@@ -261,7 +256,7 @@ void RichConfig::GenAddSlot(Int_t id)
     fGenBG->GetButton(kPythia)->SetEnabled(kFALSE);
   }
   if(id==kHijingPara){
-    fGenBG->GetButton(kHijing)->SetEnabled(kFALSE);
+    fGenBG->GetButton(kHijing)->SetEnabled(kFALSE);   fGenNprimCO->Select(500);
     fGenBG->GetButton(kPythia)->SetEnabled(kFALSE);
   }
   if(id==kPythia){
@@ -269,38 +264,30 @@ void RichConfig::GenAddSlot(Int_t id)
     fGenBG->GetButton(kHijingPara)->SetEnabled(kFALSE);
   }
 }//GenAddSlot()
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::GenRemSlot(Int_t id)
 {//is invoked when any of generator check button is released
   if(id==kGunZ){
     fGenBG->GetButton(kGun1)->SetEnabled();  fGenF->ShowFrame(fGenNprimCO);                                                                  
     fGenBG->GetButton(kGun7)->SetEnabled();                                     fGenPidCO  ->Select(kNotUsed);
-    fGenBG->GetButton(kBox1)->SetEnabled();  fGenF->ShowFrame(fGenPmaxCO);      fGenPminCO ->Select(kNotUsed);
-    fGenBG->GetButton(kBox7)->SetEnabled();  fGenF->ShowFrame(fGenChamCO); 
+    fGenBG->GetButton(kBox )->SetEnabled();  fGenF->ShowFrame(fGenPmaxCO);      fGenPminCO ->Select(kNotUsed);
   } 
   if(id==kGun1){
     fGenBG->GetButton(kGunZ)->SetEnabled();  fGenF->ShowFrame(fGenNprimCO);
     fGenBG->GetButton(kGun7)->SetEnabled();                                     fGenPidCO  ->Select(kNotUsed);
-    fGenBG->GetButton(kBox1)->SetEnabled();  fGenF->ShowFrame(fGenPmaxCO);      fGenPminCO ->Select(kNotUsed);  
-    fGenBG->GetButton(kBox7)->SetEnabled();                                     fGenChamCO ->Select(kNotUsed);
+    fGenBG->GetButton(kBox )->SetEnabled();  fGenF->ShowFrame(fGenPmaxCO);      fGenPminCO ->Select(kNotUsed);  
   }
   if(id==kGun7){
     fGenBG->GetButton(kGunZ)->SetEnabled();  fGenF->ShowFrame(fGenNprimCO);
     fGenBG->GetButton(kGun1)->SetEnabled();                                     fGenPidCO  ->Select(kNotUsed);
-    fGenBG->GetButton(kBox1)->SetEnabled();  fGenF->ShowFrame(fGenPmaxCO);      fGenPminCO ->Select(kNotUsed); 
-    fGenBG->GetButton(kBox7)->SetEnabled();  fGenF->ShowFrame(fGenChamCO); 
+    fGenBG->GetButton(kBox )->SetEnabled();  fGenF->ShowFrame(fGenPmaxCO);      fGenPminCO ->Select(kNotUsed); 
+                                             fGenF->ShowFrame(fGenChamCO); 
   } 
-  if(id==kBox1){
+  if(id==kBox){
     fGenBG->GetButton(kGunZ)->SetEnabled();                                     fGenNprimCO->Select(kNotUsed);
     fGenBG->GetButton(kGun1)->SetEnabled();                                     fGenPidCO  ->Select(kNotUsed);
     fGenBG->GetButton(kGun7)->SetEnabled();                                     fGenPminCO ->Select(kNotUsed);   fGenPmaxCO->Select(kNotUsed);
-    fGenBG->GetButton(kBox7)->SetEnabled();                                     fGenChamCO ->Select(kNotUsed);
-  }
-  if(id==kBox7){
-    fGenBG->GetButton(kGunZ)->SetEnabled();                                     fGenNprimCO->Select(kNotUsed);
-    fGenBG->GetButton(kGun1)->SetEnabled();                                     fGenPidCO  ->Select(kNotUsed);                                   
-    fGenBG->GetButton(kGun1)->SetEnabled();                                     fGenPminCO ->Select(kNotUsed);   fGenPmaxCO->Select(kNotUsed);
-    fGenBG->GetButton(kBox1)->SetEnabled(); fGenF->ShowFrame(fGenChamCO);       
+                                                                                fGenChamCO ->Select(kNotUsed);
   }
   if(id==kHijing){
     fGenBG->GetButton(kHijing)->ChangeBackground(0xbebebe);
@@ -316,69 +303,86 @@ void RichConfig::GenRemSlot(Int_t id)
     fGenBG->GetButton(kHijingPara)->SetEnabled();
   }
 }//GenRemSlot()
-//__________________________________________________________________________________________________    
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::WriteGen(FILE *pF)
 {
-  fprintf(pF,"  AliGenCocktail *pCocktail=new AliGenCocktail();\n\n");
-  if(fGenBG->GetButton(kGunZ)->GetState()==kButtonDown){//1 particle along Z axis 
-    fprintf(pF,"  AliGenFixed *pGunZ=new AliGenFixed(1);\n");
-    fprintf(pF,"  pGunZ->SetPart(%i); pGunZ->SetMomentum(%.1f); pGunZ->SetOrigin(0,0,-200);\n",fGenPidCO->GetSelected(),float(fGenPminCO->GetSelected())/10);
-    fprintf(pF,"  pCocktail->AddGenerator(pGunZ,\"gunZ\",1);\n\n");
-  }
+  Int_t pid=fGenPidCO->GetSelected();
+  Float_t pmin=0.1*fGenPminCO->GetSelected(); //particle momentum, GeV
+  Float_t pmax=0.1*fGenPmaxCO->GetSelected(); //particle momentum, GeV
+  
+  fprintf(pF,"  AliGenCocktail *pG=new AliGenCocktail();\n\n");
+  
+  if(fGenBG->GetButton(kGunZ)->GetState()==kButtonDown)//1 particle along Z axis 
+    fprintf(pF,"  AliGenFixed *pGz=new AliGenFixed(1); pGz->SetPart(%i); pGz->SetMomentum(%.1f); pGz->SetOrigin(0,0,-200); pG->AddGenerator(pGz,\"Gz\",1);\n",pid,p);
+  
   if(fGenBG->GetButton(kGun1)->GetState()==kButtonDown){//1 gun towards 1 RICH chamber
-    fprintf(pF,"  AliGenFixed *pGun1=new AliGenFixed(1);\n");
-    fprintf(pF,"  pGun1->SetPart(%i); pGun1->SetMomentum(%.1f);\n",fGenPidCO->GetSelected(),float(fGenPminCO->GetSelected())/10);
-    fprintf(pF,"  pGun1->SetTheta(pRICH->C(%i)->ThetaD()-2); pGun1->SetPhi(pRICH->C(%i)->PhiD()-2); \n",fGenChamCO->GetSelected(),fGenChamCO->GetSelected());
-    fprintf(pF,"  pCocktail->AddGenerator(pGun1,\"gun1\",1);\n\n");
+    switch(fGenChamCO->GetSelected()){
+     case 1: fprintf(pF,"  AliGenFixed *pG1=new AliGenFixed(1); pG1->SetPart(%i); pG1->SetMomentum(%.1f);\n",pid,pmin); 
+             fprintf(pF,"               pG1->SetTheta(109.5);   pG1->SetPhi(10);  pG->AddGenerator(pG1,\"g1\",1);\n"); break;
+     case 2: fprintf(pF,"  AliGenFixed *pG2=new AliGenFixed(1); pG2->SetPart(%i); pG2->SetMomentum(%.1f);\n",pid,pmin);
+            fprintf(pF,"               pG2->SetTheta( 90.0);   pG2->SetPhi(10);  pG->AddGenerator(pG2,\"g2\",1);\n"); break;
+     case 3: fprintf(pF,"  AliGenFixed *pG3=new AliGenFixed(1); pG3->SetPart(%i); pG3->SetMomentum(%.1f);\n",pid,pmin);
+            fprintf(pF,"               pG3->SetTheta(109.5);   pG3->SetPhi(30);  pG->AddGenerator(pG3,\"g3\",1);\n"); break;
+     case 4: fprintf(pF,"  AliGenFixed *pG4=new AliGenFixed(1); pG4->SetPart(%i); pG4->SetMomentum(%.1f);\n",pid,pmin);
+             fprintf(pF,"               pG4->SetTheta( 90.0);   pG4->SetPhi(30);  pG->AddGenerator(pG4,\"g4\",1);\n"); break;
+     case 5: fprintf(pF,"  AliGenFixed *pG5=new AliGenFixed(1); pG5->SetPart(%i); pG5->SetMomentum(%.1f);\n",pid,pmin);
+             fprintf(pF,"               pG5->SetTheta( 70.5);   pG5->SetPhi(30);  pG->AddGenerator(pG5,\"g5\",1);\n"); break;
+     case 6: fprintf(pF,"  AliGenFixed *pG6=new AliGenFixed(1); pG6->SetPart(%i); pG6->SetMomentum(%.1f);\n",pid,pmin);
+             fprintf(pF,"               pG6->SetTheta( 90.0);   pG6->SetPhi(50);  pG->AddGenerator(pG6,\"g6\",1);\n"); break;
+     case 7: fprintf(pF,"  AliGenFixed *pG7=new AliGenFixed(1); pG7->SetPart(%i); pG7->SetMomentum(%.1f);\n",pid,pmin);
+             fprintf(pF,"               pG7->SetTheta( 70.5);   pG7->SetPhi(50);  pG->AddGenerator(pG7,\"g7\",1);\n"); break;
+    }    
   }
+  
   if(fGenBG->GetButton(kGun7)->GetState()==kButtonDown){//7 guns towards 7 RICH chambers
-    fprintf(pF,"  for(int i=1;i<=7;i++){\n");
-    fprintf(pF,"    AliGenFixed *pGun7=new AliGenFixed(1);\n");
-    fprintf(pF,"    pGun7->SetPart(%i); pGun7->SetMomentum(1.0+i*0.5);\n",fGenPidCO->GetSelected());
-    fprintf(pF,"    pGun7->SetTheta(pRICH->C(i)->ThetaD()-2); pGun7->SetPhi(pRICH->C(i)->PhiD()); \n");                             
-    fprintf(pF,"    pCocktail->AddGenerator(pGun7,Form(\"gun7-%%i\",i),1);\n  }\n\n");  
-  }    
-  if(fGenBG->GetButton(kBox1)->GetState()==kButtonDown){//1 box towards 1 RICH chamber  
-    fprintf(pF,"  AliGenBox *pBox1=new AliGenBox(1);\n");  
-    fprintf(pF,"  pBox1->SetPart(%i); pBox1->SetMomentumRange(%.1f,%.1f);\n",fGenPidCO->GetSelected(),float(fGenPminCO->GetSelected())/10,float(fGenPmaxCO->GetSelected())/10);
-    fprintf(pF,"  pBox1->SetThetaRange(pRICH->C(%i)->ThetaD()-3,pRICH->C(%i)->ThetaD()-1); \n",fGenChamCO->GetSelected(),fGenChamCO->GetSelected());
-    fprintf(pF,"  pBox1->SetPhiRange(pRICH->C(%i)->PhiD()-1,pRICH->C(%i)->PhiD()+1); \n",fGenChamCO->GetSelected(),fGenChamCO->GetSelected());    
-    fprintf(pF,"  pCocktail->AddGenerator(pBox1,\"box1\",1);\n\n");
+    fprintf(pF,"  AliGenFixed *pG1=new AliGenFixed(1); pG1->SetPart(%i); pG1->SetMomentum(%.1f);pG1->SetTheta(109.5-3); pG1->SetPhi(10);\n",pid,pmin); 
+    fprintf(pF,"               pG->AddGenerator(pG1,\"g1\",1);\n");
+    fprintf(pF,"  AliGenFixed *pG2=new AliGenFixed(1); pG2->SetPart(%i); pG2->SetMomentum(%.1f);pG2->SetTheta( 90.0-3); pG2->SetPhi(10);\n",pid,pmin); 
+    fprintf(pF,"               pG->AddGenerator(pG2,\"g2\",1);\n");
+    fprintf(pF,"  AliGenFixed *pG3=new AliGenFixed(1); pG3->SetPart(%i); pG3->SetMomentum(%.1f);pG3->SetTheta(109.5-3); pG3->SetPhi(30);\n",pid,pmin); 
+    fprintf(pF,"               pG->AddGenerator(pG3,\"g3\",1);\n");
+    fprintf(pF,"  AliGenFixed *pG4=new AliGenFixed(1); pG4->SetPart(%i); pG4->SetMomentum(%.1f);pG4->SetTheta( 90.0-3); pG4->SetPhi(30);\n",pid,pmin); 
+    fprintf(pF,"               pG->AddGenerator(pG4,\"g4\",1);\n");
+    fprintf(pF,"  AliGenFixed *pG5=new AliGenFixed(1); pG5->SetPart(%i); pG5->SetMomentum(%.1f);pG5->SetTheta( 70.0-3); pG5->SetPhi(30);\n",pid,pmin); 
+    fprintf(pF,"               pG->AddGenerator(pG5,\"g5\",1);\n");
+    fprintf(pF,"  AliGenFixed *pG6=new AliGenFixed(1); pG6->SetPart(%i); pG6->SetMomentum(%.1f);pG6->SetTheta( 90.0-3); pG6->SetPhi(50);\n",pid,pmin); 
+    fprintf(pF,"               pG->AddGenerator(pG6,\"g6\",1);\n");
+    fprintf(pF,"  AliGenFixed *pG7=new AliGenFixed(1); pG7->SetPart(%i); pG7->SetMomentum(%.1f);pG7->SetTheta( 70.0-3); pG7->SetPhi(50);\n",pid,pmin); 
+    fprintf(pF,"               pG->AddGenerator(pG7,\"g7\",1);\n");
+  }  
+    
+  if(fGenBG->GetButton(kBox)->GetState()==kButtonDown){// box towards RICH phase space
+    fprintf(pF,"  AliGenBox *pB=new AliGenBox(%i);      pB->SetPart(%i);       pB->SetMomentumRange(%.1f,%.1f);\n",(int)fGenNprimCO->GetSelected(),pid,pmin,pmax); 
+    fprintf(pF,"             pB->SetThetaRange(65,115); pB->SetPhiRange(5,55); pG->AddGenerator(pB,\"b\",1);\n");
   }     
-  if(fGenBG->GetButton(kBox7)->GetState()==kButtonDown){//7 boxes towards 7 RICH chambers
-    fprintf(pF,"  AliGenCocktail *pCocktail=new AliGenCocktail();\n");
-    fprintf(pF,"  for(int i=1;i<=7;i++){\n");
-    fprintf(pF,"    AliGenBox *pGen=new AliGenBox(1);\n");
-    fprintf(pF,"    pGen->SetPart(%i); pGen->SetMomentumRange(%.1f,%.1f); \n",fGenPidCO->GetSelected(),float(fGenPminCO->GetSelected())/10,float(fGenPmaxCO->GetSelected())/10);
-    fprintf(pF,"    pGen->SetThetaRange(pRICH->C(i)->ThetaD()-3,pRICH->C(i)->ThetaD()-1); pGen->SetPhiRange(pRICH->C(i)->PhiD()-1,pRICH->C(i)->PhiD()+1); \n");    
-    fprintf(pF,"    pCocktail->AddGenerator(pGen,Form(\"Box %i\",i),1);\n  }\n\n");  
-  }
+  
   if(fGenBG->GetButton(kHijing)->GetState()==kButtonDown){//normal HIJING
-    fprintf(pF,"  AliGenHijing *pHij=new AliGenHijing(-1); pHij->SetEnergyCMS(5500); pHij->SetReferenceFrame(\"CMS\");\n");
-    fprintf(pF,"  pHij->SetProjectile(\"A\", 208, 82); pHij->SetTarget(\"A\", 208, 82);\n");      
-    fprintf(pF,"  pHij->SetJetQuenching(0); pHij->SetShadowing(0);\n");
-    fprintf(pF,"  pHij->KeepFullEvent(); pHij->SetSelectAll(0); \n");
-    fprintf(pF,"  pHij->SetImpactParameterRange(0, 5); //fermi\n");
-    fprintf(pF,"  pCocktail->AddGenerator(pHij,\"hijing\",1);\n\n");
+    fprintf(pF,"  AliGenHijing *pH=new AliGenHijing(-1);           pH->SetEnergyCMS(5500);        pH->SetReferenceFrame(\"CMS\");\n");
+    fprintf(pF,"                pH->SetProjectile(\"A\", 208, 82); pH->SetTarget(\"A\", 208, 82); pH->SetJetQuenching(0);\n");      
+    fprintf(pF,"                pH->SetShadowing(0);               pH->KeepFullEvent();           pH->SetSelectAll(0);\n");
+    fprintf(pF,"                pH->SetImpactParameterRange(0, 5); //fermi\n");
+    fprintf(pF,"  pG->AddGenerator(pH,\"h\",1);\n\n");
   }
+  
   if(fGenBG->GetButton(kHijingPara)->GetState()==kButtonDown){//parametrized HIJING 
-    fprintf(pF,"  AliGenHIJINGpara *pGen=new AliGenHIJINGpara(%i);\n",(int)fGenNprimCO->GetSelected());
-    fprintf(pF,"  pHijPara->SetMomentumRange(0,999); pHijPara->SetThetaRange(%f,%f); pHijPara->SetPhiRange(0,360);\n",Eta2Theta(8),Eta2Theta(-8));
-    fprintf(pF,"  pCocktail->AddGenerator(pHijPara,\"hijing para\",1);\n\n");
-  }    
-  if(fGenBG->GetButton(kPythia)->GetState()==kButtonDown){//Pythia + 7 guns towards 7 RICH chambers   
-    fprintf(pF,"  AliGenPythia *pPythia = new AliGenPythia(-1);\n");
-    fprintf(pF,"  pPythia->SetMomentumRange(0,999); pPythia->SetPhiRange(20,80); pPythia->SetThetaRange(75,115);\n");
-    fprintf(pF,"  pPythia->SetYRange(-12,12);  pPythia->SetPtRange(0,1000);  pPythia->SetStrucFunc(kCTEQ4L);\n");
-    fprintf(pF,"  pPythia->SetProcess(kPyMb);  pPythia->SetEnergyCMS(14000);\n");      
-    fprintf(pF,"  pCocktail->AddGenerator(pPythia,\"Pythia\",1);\n\n");  
+    fprintf(pF,"  AliGenHIJINGpara *pHP=new AliGenHIJINGpara(%i);\n",(int)fGenNprimCO->GetSelected());
+    fprintf(pF,"  pHP->SetMomentumRange(0,999); pHP->SetThetaRange(%f,%f); pHP->SetPhiRange(0,360);\n",Eta2Theta(8),Eta2Theta(-8));
+    fprintf(pF,"  pG->AddGenerator(pHP,\"hp\",1);\n\n");
   }
-  fprintf(pF,"  pCocktail->Init();\n");
+      
+  if(fGenBG->GetButton(kPythia)->GetState()==kButtonDown){//Pythia
+    fprintf(pF,"  AliGenPythia *pP=new AliGenPythia(-1);\n");
+    fprintf(pF,"  pP->SetMomentumRange(0,999); pP->SetPhiRange(20,80); pP->SetThetaRange(75,115);\n");
+    fprintf(pF,"  pP->SetYRange(-12,12);  pP->SetPtRange(0,1000);      pP->SetStrucFunc(kCTEQ4L);\n");
+    fprintf(pF,"  pP->SetProcess(kPyMb);  pP->SetEnergyCMS(14000);\n");      
+    fprintf(pF,"  pG->AddGenerator(pP,\"p\",1);\n\n");  
+  }
+  fprintf(pF,"  pG->Init();\n\n");
 }//WriteGenerator()
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::GuiDet(TGHorizontalFrame *pMainHF)
 {
-  pMainHF->AddFrame(fDetBG=new TGButtonGroup(pMainHF,"Detectors"));
+  pMainHF->AddFrame(fDetBG=new TGButtonGroup(pMainHF,"Dets"));
   fDetBG->Connect("Pressed(Int_t)" ,"RichConfig",this,"DetAddSlot(Int_t)");
   fDetBG->Connect("Released(Int_t)","RichConfig",this,"DetRemSlot(Int_t)");
     new TGCheckButton(fDetBG,"PIPE"  ,kPIPE));     new TGCheckButton(fDetBG,"ITS"   ,kITS));   new TGCheckButton(fDetBG,"TPC"   ,kTPC));
@@ -389,13 +393,13 @@ void RichConfig::GuiDet(TGHorizontalFrame *pMainHF)
     new TGCheckButton(fDetBG,"EMCAL" ,kEMCAL));    new TGCheckButton(fDetBG,"VZERO" ,kVZERO)); new TGCheckButton(fDetBG,"MUON"  ,kMUON));         
     new TGCheckButton(fDetBG,"ZDC"   ,kZDC));      new TGCheckButton(fDetBG,"SHILD" ,kSHILD));         
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::DetAddSlot(Int_t id)
 {//slot is invoked when any detector check button is pressed
   if(id==kTRD || id==kTOF)     //TRD and TOF geometries depend on FRAME 
     fDetBG->SetButton(kFRAME);
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::DetRemSlot(Int_t id)
 {//slot is invoked when any detector check button is released
   if(id==kFRAME){
@@ -403,25 +407,25 @@ void RichConfig::DetRemSlot(Int_t id)
     fDetBG->SetButton(kTOF,kFALSE);
   }
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::WriteDet(FILE *pF)
 {
-//central detectors                  
+//CORE detectors                  
   if(fDetBG->GetButton(kPIPE )->GetState()) fprintf(pF,"\n  new AliPIPEv0(\"PIPE\",\"Beam Pipe\");\n");
   if(fDetBG->GetButton(kSHILD)->GetState()) fprintf(pF,"\n  new AliSHILv2(\"SHIL\",\"Shielding Version 2\");\n");  
   if(fDetBG->GetButton(kITS  )->GetState()){
     fprintf(pF,"\n  AliITSvPPRasymmFMD *pIts =new AliITSvPPRasymmFMD(\"ITS\",\"ITS PPR detailed version\");\n");
-    fprintf(pF,"  pIts->SetMinorVersion(2); pIts->SetReadDet(kTRUE);\n");
+    fprintf(pF,"  pIts->SetMinorVersion(2); pIts->SetReadDet(kFALSE);\n");
     fprintf(pF,"  pIts->SetThicknessDet1(200.); pIts->SetThicknessDet2(200.);\n");
-    fprintf(pF,"  pIts->SetThicknessChip1(200.); pIts->SetThicknessChip2(200.);\n");
+    fprintf(pF,"  pIts->SetThicknessChip1(150.); pIts->SetThicknessChip2(150.);\n");
     fprintf(pF,"  pIts->SetRails(0); pIts->SetCoolingFluid(1);\n");
     fprintf(pF,"  pIts->SetEUCLID(0);\n");
   }  
-  if(fDetBG->GetButton(kTPC  )->GetState()) fprintf(pF,"\n  new AliTPCv2(\"TPC\",\"Default\");\n");  
-  if(fDetBG->GetButton(kFRAME)->GetState()) fprintf(pF,"\n  AliFRAMEv2 *pFrame=new AliFRAMEv2(\"FRAME\",\"Space Frame\"); pFrame->SetHoles(1);\n");
-  if(fDetBG->GetButton(kTRD  )->GetState()){fprintf(pF,"\n  AliTRD *pTrd=new AliTRDv1(\"TRD\",\"TRD slow simulator\");\n");fprintf(pF,"  pTrd->SetGasMix(1); pTrd->SetPHOShole(); pTrd->SetRICHhole();pTrd->CreateTR();\n");}  
+  if(fDetBG->GetButton(kTPC  )->GetState())  fprintf(pF,"\n  new AliTPCv2(\"TPC\",\"Default\");\n");
+  if(fDetBG->GetButton(kFRAME)->GetState())  fprintf(pF,"\n  AliFRAMEv2 *pFrame=new AliFRAMEv2(\"FRAME\",\"Space Frame\"); pFrame->SetHoles(1);\n");
+  if(fDetBG->GetButton(kTRD  )->GetState())  fprintf(pF,"\n  AliTRD *pTrd=new AliTRDv1(\"TRD\",\"TRD slow simulator\");\n");  
   if(fDetBG->GetButton(kTOF  )->GetState()) fprintf(pF,"\n  new AliTOFv4T0(\"TOF\", \"normal TOF\");\n");
-//central detectors  
+//central detectors  behind RICH
   if(fDetBG->GetButton(kMAG  )->GetState()) fprintf(pF,"\n  new AliMAG(\"MAG\",\"Magnet\");\n");  
   if(fDetBG->GetButton(kHALL )->GetState()) fprintf(pF,"\n  new AliHALL(\"HALL\",\"Alice Hall\");\n");
 //forward detectors  
@@ -438,7 +442,7 @@ void RichConfig::WriteDet(FILE *pF)
   if(fDetBG->GetButton(kEMCAL)->GetState()) fprintf(pF,"\n  new AliEMCALv1(\"EMCAL\",\"G56_2_55_19_104_14\");\n");
   if(fDetBG->GetButton(kCRT  )->GetState()) fprintf(pF,"\n  new AliCRTv0(\"CRT\",\"normal ACORDE\");\n");
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::GuiBatch(TGHorizontalFrame *pMainF)
 {
   TGGroupFrame *pSimF=new TGGroupFrame(pMainF,"Simu"); pMainF->AddFrame(pSimF);    
@@ -447,11 +451,11 @@ void RichConfig::GuiBatch(TGHorizontalFrame *pMainF)
     new TGCheckButton(fSimBG,   "Transport"       ,kTransport));   fSimBG->SetButton(kTransport);
   pSimF->AddFrame (fSDigBG=new TGButtonGroup(pSimF,""  ));
     new TGRadioButton(fSDigBG,  "No SDigits"      ,kNo       ));   
-    new TGRadioButton(fSDigBG,  "SDigits ALL"     ,kAll      ));  
+    new TGRadioButton(fSDigBG,  "SDigits CORE"    ,kAll      ));  
     new TGRadioButton(fSDigBG,  "SDigits RICH"    ,kOnly     ));   fSDigBG->SetButton(kOnly);
   pSimF->AddFrame (fDigBG=new TGButtonGroup(pSimF,""   ));
     new TGRadioButton(fDigBG,   "No Digits"       ,kNo       ));   
-    new TGRadioButton(fDigBG,   "Digits ALL"      ,kAll      ));  
+    new TGRadioButton(fDigBG,   "Digits CORE"     ,kAll      ));  
     new TGRadioButton(fDigBG,   "Digits RICH"     ,kOnly     ));   fDigBG->SetButton(kOnly); 
   pSimF->AddFrame(fRawBG=new TGButtonGroup(pSimF,""    ));
     new TGRadioButton(fRawBG,   "No RAW files"    ,kNo       ));   fRawBG->SetButton(kNo);
@@ -462,83 +466,96 @@ void RichConfig::GuiBatch(TGHorizontalFrame *pMainF)
   TGCompositeFrame *pRecF=new TGGroupFrame(pMainF,"Reco"); pMainF->AddFrame(pRecF);    
   pRecF->AddFrame(fClusBG=new TGButtonGroup(pRecF,""   ));
     new TGRadioButton(fClusBG,  "No Clusters"     ,kNo       ));  
-    new TGRadioButton(fClusBG,  "Clusters ALL"    ,kAll      ));  
+    new TGRadioButton(fClusBG,  "Clusters CORE"   ,kAll      ));  
     new TGRadioButton(fClusBG,  "Clusters RICH"   ,kOnly     ));   fClusBG->SetButton(kOnly);
-  pRecF->AddFrame(fRecoBG=new TGButtonGroup(pRecF,""   ));
-    new TGCheckButton(fRecoBG,  "Find vertex"     ,kVertex   ));  
+    
+  pRecF->AddFrame(fRecoBG=new TGButtonGroup(pRecF,""   ));                       fRecoBG->Connect("Pressed(Int_t)","RichConfig",this,"SlotBatch(Int_t)");
+    new TGCheckButton(fRecoBG,  "Load Align data" ,kAlign    ));  
     new TGCheckButton(fRecoBG,  "Find ESD tracks" ,kTrack    ));  
-    new TGCheckButton(fRecoBG,  "Add info ESD"    ,kEsd      ));
+    new TGCheckButton(fRecoBG,  "Find vertex"     ,kVertex   ));  
+    new TGCheckButton(fRecoBG,  "Fill ESD"        ,kEsd      ));
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void RichConfig::SlotBatch(Int_t id)
+{//slot is invoked when any button in fRecoBG is pressed
+  if(id==kTrack){
+    fSDigBG->SetButton(kAll); 
+    fDigBG->SetButton(kAll);
+    fClusBG->SetButton(kAll);
+    fDetBG->SetButton(kITS);
+    fDetBG->SetButton(kTPC);
+    fDetBG->SetButton(kTRD);
+  }
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::WriteBatch()
 {//creates Batch.C file
   char *sBatchName="RichBatch";
   FILE *fp=fopen(Form("%s.C",sBatchName),"w"); if(!fp){Info("CreateBatch","Cannot open output file: %s.C",sBatchName);return;}
-//header and debug   
+  
                                                        fprintf(fp,"void %s(const Int_t iNevents,const Bool_t isDebug,const char *sConfigFileName)\n{\n",sBatchName);
-                                                       fprintf(fp,"  gSystem->Exec(\"rm -rf *.root hlt hough fort* raw* ZZZ*\");\n");
+                                                       
+  if(fSimBG->GetButton(kPrim)->GetState())             fprintf(fp,"  gSystem->Exec(\"rm -rf *.root hlt hough fort* raw* ZZZ*\");\n");
+  else                                                 fprintf(fp,"  gSystem->Exec(\"rm -rf  hlt hough raw* ZZZ*\");\n");
+  
                                                        fprintf(fp,"  if(isDebug)   AliLog::SetGlobalDebugLevel(AliLog::kDebug);\n");
                                                        fprintf(fp,"  gBenchmark->Start(\"ALICE\");\n  TDatime time;\n\n");
 //simulation section  
+  if(fSimBG->GetButton(kPrim)->GetState()){
                                                        fprintf(fp,"  AliSimulation     *pSim=new AliSimulation(sConfigFileName);\n");
-//generate initial kinematics  
-  if(fSimBG->GetButton(kPrim)->GetState()) 
-                                                       fprintf(fp,"  pSim->SetRunGeneration(kTRUE);           //initial kinematics generated\n");
-  else
-                                                       fprintf(fp,"  pSim->SetRunGeneration(kFALSE);          //no initial kinematics generated\n");
+                                                       
+  if(fSimBG->GetButton(kPrim)->GetState())             fprintf(fp,"  pSim->SetRunGeneration(kTRUE);           //initial kinematics generated\n");
+  else                                                 fprintf(fp,"  pSim->SetRunGeneration(kFALSE);          //no initial kinematics generated\n");
 //transport and hit creations  
   if(fSimBG->GetButton(kTransport)->GetState()) 
-                                                       fprintf(fp,"  pSim->SetRunSimulation(kTRUE);           //transport and hits creation\n");
+                                                       fprintf(fp,"  pSim->SetRunSimulation(kTRUE);                  //transport and hits creation\n");
   else
-                                                       fprintf(fp,"  pSim->SetRunSimulation(kFALSE);          //no transport and hits creation\n");
+                                                       fprintf(fp,"  pSim->SetRunSimulation(kFALSE);                 //no transport and hits creation\n");
 //sdigits  
-  if     (fSDigBG->GetButton(kNo)    ->GetState())     fprintf(fp,"  pSim->SetMakeSDigits(\"\");              //no sdigits created\n");
-  else if(fSDigBG->GetButton(kAll)   ->GetState())     fprintf(fp,"  pSim->SetMakeSDigits(\"ALL\");           //sdigits created for ALL\n");
-  else if(fSDigBG->GetButton(kOnly)  ->GetState())     fprintf(fp,"  pSim->SetMakeSDigits(\"RICH\");          //sdigits created for RICH\n");
+  if     (fSDigBG->GetButton(kNo)    ->GetState())     fprintf(fp,"  pSim->SetMakeSDigits(\"\");                     //no sdigits created\n");
+  else if(fSDigBG->GetButton(kAll)   ->GetState())     fprintf(fp,"  pSim->SetMakeSDigits(\"ITS TPC TRD TOF RICH\"); //sdigits created for these detectors\n");
+  else if(fSDigBG->GetButton(kOnly)  ->GetState())     fprintf(fp,"  pSim->SetMakeSDigits(\"RICH\");                 //sdigits created for RICH only\n");
 //digits  
-  if     (fDigBG->GetButton(kNo)    ->GetState())      fprintf(fp,"  pSim->SetMakeDigits(\"\");               //no digits created\n");
-  else if(fDigBG->GetButton(kAll)   ->GetState())      fprintf(fp,"  pSim->SetMakeDigits(\"ALL\");            //digits created for all detectors\n");
-  else if(fDigBG->GetButton(kOnly)  ->GetState())      fprintf(fp,"  pSim->SetMakeDigits(\"RICH\");           //digits created for RICH\n");
+  if     (fDigBG->GetButton(kNo)    ->GetState())      fprintf(fp,"  pSim->SetMakeDigits(\"\");                      //no digits created\n");
+  else if(fDigBG->GetButton(kAll)   ->GetState())      fprintf(fp,"  pSim->SetMakeDigits(\"ITS TPC TRD TOF RICH\");  //digits created for these detectors\n");
+  else if(fDigBG->GetButton(kOnly)  ->GetState())      fprintf(fp,"  pSim->SetMakeDigits(\"RICH\");                  //digits created for RICH only\n");
 //raw data generation  
-  if     (fRawBG->GetButton(kRawDdl)->GetState())      fprintf(fp,"  pSim->SetWriteRawData(\"ALL\");          //raw data in DDL  format for ALL\n");
-  else if(fRawBG->GetButton(kRawDate)->GetState())     fprintf(fp,"  pSim->SetWriteRawData(\"ALL\",\".date\");//raw data in DATE format for ALL\n");
-  else if(fRawBG->GetButton(kRawRoot)->GetState())     fprintf(fp,"  pSim->SetWriteRawData(\"ALL\",\".root\");//raw data in ROOT format for ALL\n");
+  if     (fRawBG->GetButton(kRawDdl)->GetState())      fprintf(fp,"  pSim->SetWriteRawData(\"ITS TPC TRD TOF RICH\");//raw data in DDL  format for these detectors\n");
+  else if(fRawBG->GetButton(kRawDate)->GetState())     fprintf(fp,"  pSim->SetWriteRawData(\"ITS TPC TRD TOF RICH\",\".date\");//raw data in DATE format for these detectors\n");
+  else if(fRawBG->GetButton(kRawRoot)->GetState())     fprintf(fp,"  pSim->SetWriteRawData(\"ITS TPC TRD TOF RICH\",\".root\");//raw data in ROOT format for these detectors\n");
   
                                                        fprintf(fp,"  pSim->Run(iNevents);\n  delete pSim;\n\n");
-//reconstraction section  
-  if(!fClusBG->GetButton(kNo)->GetState()){
+  }                                                     
+
+
+//reconstraction section - cluster finder
                                                        fprintf(fp,"  AliReconstruction *pRec=new AliReconstruction;\n");
-    if     (fClusBG->GetButton(kAll)   ->GetState())   fprintf(fp,"  pRec->SetRunLocalReconstruction(\"ALL\");        //run cluster creation for ALL\n");
-    else if(fClusBG->GetButton(kOnly)  ->GetState())   fprintf(fp,"  pRec->SetRunLocalReconstruction(\"RICH\");       //run cluster creation for RICH\n");
-    
-    if(fRecoBG->GetButton(kVertex)->GetState())
-                                                       fprintf(fp,"  pRec->SetRunVertexFinder(kTRUE);                 //run ESD vertex task\n");
-    else
-                                                       fprintf(fp,"  pRec->SetRunVertexFinder(kFALSE);                //not run ESD vertex task\n");
-    
-    if(fRecoBG->GetButton(kTrack)->GetState())
-                                                       fprintf(fp,"  pRec->SetRunTracking(\"ITS TPC TRD TOF RICH\");  //run ESD track task\n");
-    else
-                                                       fprintf(fp,"  pRec->SetRunTracking(\"\");                      //not run ESD track task\n");
-    
-    if(fRecoBG->GetButton(kEsd)->GetState())
-                                                       fprintf(fp,"  pRec->SetFillESD(\"ITS TPC TRD TOF RICH\");      //run ESD add info task\n");      
-    else
-                                                       fprintf(fp,"  pRec->SetFillESD(\"\");                          //not run ESD add info task\n");
-    
-    
+  if(fRecoBG->GetButton(kAlign)->GetState())           fprintf(fp,"  pRec->SetLoadAlignData(\"ITS TPC TRD TOF RICH\");          //Misalign data for these detectors\n");     
+  else                                                 fprintf(fp,"  pRec->SetLoadAlignData(\"\");                              //Misalign data not loaded\n");     
+  
+    if     (fClusBG->GetButton(kAll)   ->GetState())   fprintf(fp,"  pRec->SetRunLocalReconstruction(\"ITS TPC TRD TOF RICH\"); //clusters created for these detectors\n");
+    else if(fClusBG->GetButton(kOnly)  ->GetState())   fprintf(fp,"  pRec->SetRunLocalReconstruction(\"RICH\");                 //clusters created for RICH only\n");
+    else if(fClusBG->GetButton(kNo)    ->GetState())   fprintf(fp,"  pRec->SetRunLocalReconstruction(\"\");                     //clusters are not created\n");
+//reconstraction section - vertex finder
+    if     (fRecoBG->GetButton(kVertex)->GetState())   fprintf(fp,"  pRec->SetRunVertexFinder(kTRUE);                           //run vertex finder\n");
+    else                                               fprintf(fp,"  pRec->SetRunVertexFinder(kFALSE);                          //do not run vertex finder\n");    
+//reconstraction section - tracks finder    
+    if     (fRecoBG->GetButton(kTrack) ->GetState())   fprintf(fp,"  pRec->SetRunTracking(\"ITS TPC TRD TOF RICH\");            //run tracking for these detectors\n");
+    else                                               fprintf(fp,"  pRec->SetRunTracking(\"\");                                //do not run tracking\n");    
+//reconstraction section - fill ESD (prob vector creator)    
+    if     (fRecoBG->GetButton(kEsd)   ->GetState())   fprintf(fp,"  pRec->SetFillESD(\"ITS TPC TRD TOF RICH\");                //run fill ESD (prob vect)\n");      
+    else                                               fprintf(fp,"  pRec->SetFillESD(\"\");                                    //do not run fill ESD (prob vect)\n");
                                                        fprintf(fp,"  pRec->Run();delete pRec;\n\n");         
-  }
 //benchmarks  
                                                        fprintf(fp,"  cout<<\"!!!!!!!!!!!!Info in <my/Batch.C>: Start time: \";time.Print();\n");
                                                        fprintf(fp,"  cout<<\"!!!!!!!!!!!!Info in <my/Batch.C>: Stop  time: \";time.Set();  time.Print();\n");
                                                        fprintf(fp,"  gBenchmark->Show(\"ALICE\");\n");
   
-                                                       fprintf(fp,"  gSystem->Exec(\"play -c 2 ~/.kde/my/end.wav\");\n");
+                                                       fprintf(fp,"  gSystem->Exec(\"play -c 2 ~/my/end.wav\");\n");
                                                        fprintf(fp,"  gSystem->Exec(\"touch ZZZ______finished_______ZZZ\");\n}\n");
   fclose(fp);  
 }//WriteBatch()
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::ExitSlot()
 {
 //slot to be invoked by clik on the Create button  
@@ -547,7 +564,7 @@ void RichConfig::ExitSlot()
   SendCloseMessage();
   gApplication->Terminate(0);
 }
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig::WriteConfig()
 {   
   FILE *pF=fopen(fFileName,"w"); if(!pF){Info("CreateConfigFile","Cannot open output file:%sn",fFileName);return;}
@@ -566,39 +583,38 @@ void RichConfig::WriteConfig()
   fprintf(pF,"  pAL->SetNumberOfEventsPerFile(1000);\n");
   fprintf(pF,"  gAlice->SetRunLoader(pAL);\n\n");
 //Decayer  
-  fprintf(pF,"  TVirtualMCDecayer *pDecayer=new AliDecayerPythia();\n");
-  fprintf(pF,"  pDecayer->SetForceDecay(kAll);\n"); 
-  fprintf(pF,"  pDecayer->Init();\n"); 
-  fprintf(pF,"  gMC->SetExternalDecayer(pDecayer);\n\n");
-  
+  if(fDecayerB->GetState()==kButtonDown){   
+    fprintf(pF,"  TVirtualMCDecayer *pDecayer=new AliDecayerPythia();\n");
+    fprintf(pF,"  pDecayer->SetForceDecay(kAll);\n"); 
+    fprintf(pF,"  pDecayer->Init();\n"); 
+    fprintf(pF,"  gMC->SetExternalDecayer(pDecayer);\n\n");
+  }
   WritePhys(pF); //physics processes
   
 //Field
        if(fMagBG->GetButton(kFld0)->GetState())     fprintf(pF,"  gAlice->SetField(0);        //no field\n\n");
-  else if(fMagBG->GetButton(kFld2)->GetState())     fprintf(pF,"  gAlice->SetField();         //2kG constant field (2kG scaled by 1)\n\n");
-  else if(fMagBG->GetButton(kFld4)->GetState())     fprintf(pF,"  gAlice->SetField(2,1,2);    //4kG constant field (2kG scaled by 2)\n\n");
-  else if(fMagBG->GetButton(kFld5)->GetState())     fprintf(pF,"  gAlice->SetField(2,1,2.5);  //5kG constant field (2kG scaled by 2.5)\n\n");
-  else if(fMagBG->GetButton(kFld_2)->GetState())    fprintf(pF,"  gAlice->SetField(2,1,-1);   //-2kG constant field (2kG scaled by -1)\n\n");
-  else if(fMagBG->GetButton(kFld_4)->GetState())    fprintf(pF,"  gAlice->SetField(2,1,-2);   //-4kG constant field (2kG scaled by -2)\n\n");
-  else if(fMagBG->GetButton(kFld_5)->GetState())    fprintf(pF,"  gAlice->SetField(2,1,-2.5); //-5kG constant field (2kG scaled by -2.5)\n\n");
+  else if(fMagBG->GetButton(kFld2)->GetState())     fprintf(pF,"  gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,1,10,0));//0.2 Tesla field\n\n");
+  else if(fMagBG->GetButton(kFld4)->GetState())     fprintf(pF,"  gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,1,10,1));//0.4 Tesla field\n\n");
+  else if(fMagBG->GetButton(kFld5)->GetState())     fprintf(pF,"  gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,1,10,2));//0.5 Tesla field\n\n");
+  else if(fMagBG->GetButton(kFld_2)->GetState())    fprintf(pF,"  gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,-1,10,0));//-0.2 Tesla field\n\n");
+  else if(fMagBG->GetButton(kFld_4)->GetState())    fprintf(pF,"  gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,-1,10,1));//-0.4 Tesla field\n\n");
+  else if(fMagBG->GetButton(kFld_5)->GetState())    fprintf(pF,"  gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,-1,10,2));//-0.5 Tesla field\n\n");
   
   fprintf(pF,"  pAL->CdGAFile();\n\n");                                 //????       
+//Generator 
+  WriteGen(pF);//generator
 //BODY-ALIC 
   fprintf(pF,"  new AliBODY(\"BODY\",\"Alice envelop\");\n\n");
-
+//RICH
   WriteRich(pF);  //private RICH part
-  WriteGen(pF);//generator
   WriteDet(pF);  //other detectors
 //end of Config.C file:  
   fprintf(pF,"\n  ::Info(\"----------> RICH private config\",\"Stop\\n\\n\\n\");\n"); 
   fprintf(pF,"}\n");
   fclose(pF);  
 }//WriteConfig()
-
-
-RichConfig *kir=0;
-//__________________________________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void RichConfig()
 {
-   kir=new RichConfig("Config.C");
+   new RichConfig("Config.C");
 }