X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HMPID%2FHconfig.C;h=6c3b800052561e482c0cb4e441999b06587dac93;hb=fabd1b29b19f5e55c55ae47ba229604864b8b388;hp=88477bf97a871ee4885f7a68b80d4bc8e314efa9;hpb=6453cfc6d5377c98c7c9d4f6b0543390d6a6ea6d;p=u%2Fmrichter%2FAliRoot.git diff --git a/HMPID/Hconfig.C b/HMPID/Hconfig.C index 88477bf97a8..6c3b8000525 100644 --- a/HMPID/Hconfig.C +++ b/HMPID/Hconfig.C @@ -1,5 +1,16 @@ +//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++// + + #include +Bool_t gGun1 =kFALSE; +Bool_t gGun7 =kFALSE; +Bool_t gGunZ =kFALSE; +Bool_t gBox =kFALSE; +Bool_t gHijing =kFALSE; +Bool_t gHijingPara=kFALSE; +Bool_t gPythia =kFALSE; + class HmpConfig : public TGMainFrame { RQ_OBJECT() @@ -7,12 +18,12 @@ public: HmpConfig(const char*sFileName); ~HmpConfig() {Info("ctor","");Cleanup();} - enum EVersOpts {kNo=101,kVer0,kVer1,kVer2,kTest, kDeclust=301,kSagita,kFeedback,kSecRad,kQe0=400,kQeNorm,kOptics}; + enum EVersOpts {kNo=101,kVer0,kVer1,kVer2,kVer3,kTest, kDeclust=301,kSagita,kFeedback,kElNoise,kQe0=400,kQeNorm,kFlatIdx,kOptics}; enum EGenTypes {kGunZ=1,kGun1,kGun7,kBox,kHijing,kHijingPara,kPythia,kHmpLib,kNotUsed=999}; enum EDetectors {kPIPE=1,kITS,kTPC,kTRD,kTOF,kFRAME,kMAG,kACORDE,kHALL,kPHOS,kT0,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{kAll=55,kHmp,kDdl,kDat,kRoo,kVtx,kTrk,kHlt,kPid,kAln}; + enum EBatchFlags{kAll=55,kHmp,kDdl,kDat,kRoo,kVtx,kTrk,kHlt,kPid,kAln,kRecoPar}; 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));} @@ -73,15 +84,17 @@ void HmpConfig::GuiHmp(TGHorizontalFrame *pMainHF) pHmpGF->AddFrame(fVerBG=new TGButtonGroup(pHmpGF,"")); fVerBG->Connect("Pressed(Int_t)" ,"HmpConfig",this,"HmpVerSlot(Int_t)"); new TGRadioButton(fVerBG, "No" ,kNo ); new TGRadioButton(fVerBG, "ver0" ,kVer0 ); - new TGRadioButton(fVerBG, "ver1" ,kVer1 ); fVerBG->SetButton(kVer1); - new TGRadioButton(fVerBG, "ver2" ,kVer2 ); + new TGRadioButton(fVerBG, "ver1" ,kVer1 ); + new TGRadioButton(fVerBG, "ver2" ,kVer2 ); + new TGRadioButton(fVerBG, "ver3" ,kVer3 ); fVerBG->SetButton(kVer3); pHmpGF->AddFrame(fOptBG=new TGButtonGroup(pHmpGF,"")); fOptBG->Connect("Pressed(Int_t)" ,"HmpConfig",this,"HmpVerSlot(Int_t)"); - new TGCheckButton(fOptBG,"Test beam position?" ,kTest); - new TGCheckButton(fOptBG,"Second radiator?" ,kSecRad); - new TGCheckButton(fOptBG,"Decluster?" ,kDeclust); fOptBG->SetButton(kDeclust); - new TGCheckButton(fOptBG,"Wire sagita?" ,kSagita); fOptBG->SetButton(kSagita); - new TGCheckButton(fOptBG,"Feedbacks?" ,kFeedback); fOptBG->SetButton(kFeedback); - new TGCheckButton(fOptBG,"Plot optics?" ,kOptics); + new TGCheckButton(fOptBG,"Test run position" ,kTest); + new TGCheckButton(fOptBG,"Unfold cluster " ,kDeclust); fOptBG->SetButton(kDeclust); + new TGCheckButton(fOptBG,"Wire sagitta " ,kSagita); fOptBG->SetButton(kSagita); + new TGCheckButton(fOptBG,"Photon feedback " ,kFeedback); fOptBG->SetButton(kFeedback); + new TGCheckButton(fOptBG,"Electronic noise " ,kElNoise); // fOptBG->SetButton(kElNoise); + new TGCheckButton(fOptBG,"C6F14 N=1.292 " ,kFlatIdx); + new TGCheckButton(fOptBG,"Plot optics " ,kOptics); pHmpGF->AddFrame(fQeBG=new TGButtonGroup(pHmpGF,"")); new TGRadioButton(fQeBG,"QE=0" ,kQe0); new TGRadioButton(fQeBG,"QE normal" ,kQeNorm); fQeBG->SetButton(kQeNorm); @@ -105,15 +118,18 @@ void HmpConfig::WriteHmp(FILE *pF) { if(!fVerBG->GetButton(kNo)->GetState()){ TString title; - if( fOptBG->GetButton(kSecRad)->GetState()) title+=" Radiator2 "; - if(!fOptBG->GetButton(kSagita)->GetState()) fprintf(pF," AliHMPIDParam::fgIsWireSagita=kFALSE;\n"); - if( fOptBG->GetButton(kTest) ->GetState()) title+=" TestBeam "; - if( fOptBG->GetButton(kOptics)->GetState()) title+=" ShowOptics "; + if(!fOptBG->GetButton(kSagita) ->GetState()) fprintf(pF," AliHMPIDParam::fgIsWireSagita=kFALSE;\n"); + if(!fOptBG->GetButton(kFeedback)->GetState()) title+=" NoFeedBack "; + if( fOptBG->GetButton(kElNoise) ->GetState()) fprintf(pF," AliHMPIDDigitizer::DoNoise(kTRUE);\n"); + if( fOptBG->GetButton(kTest) ->GetState()) title+=" TestBeam "; + if( fOptBG->GetButton(kOptics) ->GetState()) title+=" ShowOptics "; + if( fOptBG->GetButton(kFlatIdx) ->GetState()) title+=" FlatIdx "; if(title.Length()==0) title="Default"; if (fVerBG->GetButton(kVer0)->GetState()) fprintf(pF," new AliHMPIDv0(\"Gel %s\");\n\n",title.Data()); else if(fVerBG->GetButton(kVer1)->GetState()) fprintf(pF," new AliHMPIDv1(\"HMPID\",\"%s\");\n\n",title.Data()); - else if(fVerBG->GetButton(kVer2)->GetState()) fprintf(pF," new AliHMPIDv2(\"Tic %s\");\n\n",title.Data()); + else if(fVerBG->GetButton(kVer2)->GetState()) fprintf(pF," new AliHMPIDv2(\"HMPID\",\"%s\");\n\n",title.Data()); + else if(fVerBG->GetButton(kVer3)->GetState()) fprintf(pF," new AliHMPIDv3(\"HMPID\",\"%s\");\n\n",title.Data()); } } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -196,6 +212,9 @@ void HmpConfig::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=10" ,10); + fGenNprimCO->AddEntry("N prim=20" ,20); + fGenNprimCO->AddEntry("N prim=50" ,50); fGenNprimCO->AddEntry("N prim=100" ,100); fGenNprimCO->AddEntry("N prim=500" ,500); fGenNprimCO->AddEntry("N prim=1000" ,1000); @@ -226,7 +245,7 @@ void HmpConfig::GuiGen(TGCompositeFrame *pMainF) //Chamber number fGenF->AddFrame(fGenChamCO=new TGComboBox(fGenF,100)); //add chamber number combo to generator vertical frame 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); + for(int i=1;i<=7;i++) fGenChamCO->AddEntry(Form("Chamber %i",i-1),i); fGenChamCO->Resize(160,20); fGenChamCO->Select(kNotUsed); }//GuiGen() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void HmpConfig::GenAddSlot(Int_t id) @@ -235,72 +254,82 @@ void HmpConfig::GenAddSlot(Int_t id) 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); + fGenF->HideFrame(fGenChamCO); + gGunZ=!gGunZ; } if(id==kGun1){ 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); + gGun1=!gGun1; } if(id==kGun7){ fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE); fGenF->HideFrame(fGenNprimCO); fGenBG->GetButton(kGun1)->SetEnabled(kFALSE); fGenPidCO->Select(kProton); fGenBG->GetButton(kBox )->SetEnabled(kFALSE); fGenF->HideFrame(fGenPmaxCO); fGenPminCO->Select(25); fGenF->HideFrame(fGenChamCO); + gGun7=!gGun7; } 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(15); fGenPmaxCO->Select(15); + fGenF->HideFrame(fGenChamCO); + gBox=!gBox; } if(id==kHijing){ - fGenBG->GetButton(kHijing)->ChangeBackground(0xff0000); +// fGenBG->GetButton(kHijing)->ChangeBackground(0xff0000); fGenBG->GetButton(kHijingPara)->SetEnabled(kFALSE); fGenBG->GetButton(kPythia)->SetEnabled(kFALSE); + gHijing=!gHijing; } if(id==kHijingPara){ fGenBG->GetButton(kHijing)->SetEnabled(kFALSE); fGenNprimCO->Select(500); fGenBG->GetButton(kPythia)->SetEnabled(kFALSE); + gHijingPara=!gHijingPara; } if(id==kPythia){ fGenBG->GetButton(kHijing)->SetEnabled(kFALSE); fGenBG->GetButton(kHijingPara)->SetEnabled(kFALSE); + gPythia=!gPythia; } }//GenAddSlot() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void HmpConfig::GenRemSlot(Int_t id) {//is invoked when any of generator check button is released - if(id==kGunZ){ + if(id==kGunZ&&!gGunZ){ fGenBG->GetButton(kGun1)->SetEnabled(); fGenF->ShowFrame(fGenNprimCO); fGenBG->GetButton(kGun7)->SetEnabled(); fGenPidCO ->Select(kNotUsed); fGenBG->GetButton(kBox )->SetEnabled(); fGenF->ShowFrame(fGenPmaxCO); fGenPminCO ->Select(kNotUsed); } - if(id==kGun1){ + if(id==kGun1&&!gGun1){ fGenBG->GetButton(kGunZ)->SetEnabled(); fGenF->ShowFrame(fGenNprimCO); fGenBG->GetButton(kGun7)->SetEnabled(); fGenPidCO ->Select(kNotUsed); fGenBG->GetButton(kBox )->SetEnabled(); fGenF->ShowFrame(fGenPmaxCO); fGenPminCO ->Select(kNotUsed); + fGenChamCO ->Select(kNotUsed); } - if(id==kGun7){ + if(id==kGun7&&!gGun7){ fGenBG->GetButton(kGunZ)->SetEnabled(); fGenF->ShowFrame(fGenNprimCO); fGenBG->GetButton(kGun1)->SetEnabled(); fGenPidCO ->Select(kNotUsed); fGenBG->GetButton(kBox )->SetEnabled(); fGenF->ShowFrame(fGenPmaxCO); fGenPminCO ->Select(kNotUsed); fGenF->ShowFrame(fGenChamCO); } - if(id==kBox){ + if(id==kBox&&!gBox){ fGenBG->GetButton(kGunZ)->SetEnabled(); fGenNprimCO->Select(kNotUsed); fGenBG->GetButton(kGun1)->SetEnabled(); fGenPidCO ->Select(kNotUsed); fGenBG->GetButton(kGun7)->SetEnabled(); fGenPminCO ->Select(kNotUsed); fGenPmaxCO->Select(kNotUsed); fGenChamCO ->Select(kNotUsed); } - if(id==kHijing){ - fGenBG->GetButton(kHijing)->ChangeBackground(0xbebebe); + if(id==kHijing&&!gHijing){ +// fGenBG->GetButton(kHijing)->ChangeBackground(0xbebebe); fGenBG->GetButton(kHijingPara)->SetEnabled(); fGenBG->GetButton(kPythia)->SetEnabled(); } - if(id==kHijingPara){ - fGenBG->GetButton(kHijing)->SetEnabled(); + if(id==kHijingPara&&!gHijingPara){ + fGenBG->GetButton(kHijing)->SetEnabled(); fGenNprimCO->Select(kNotUsed); fGenBG->GetButton(kPythia)->SetEnabled(); } - if(id==kPythia){ + if(id==kPythia&&!gPythia){ fGenBG->GetButton(kHijing)->SetEnabled(); fGenBG->GetButton(kHijingPara)->SetEnabled(); } @@ -312,10 +341,13 @@ void HmpConfig::WriteGen(FILE *pF) 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(kHijing)->GetState()==kButtonDown || + fGenBG->GetButton(kHijingPara)->GetState()==kButtonDown || + fGenBG->GetButton(kPythia)->GetState()==kButtonDown) {;} + else {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); + 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,pmin); if(fGenBG->GetButton(kGun1)->GetState()==kButtonDown){//1 gun towards 1 HMPID chamber switch(fGenChamCO->GetSelected()){ @@ -326,7 +358,7 @@ void HmpConfig::WriteGen(FILE *pF) 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; + fprintf(pF," pG4->SetTheta( 87.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); @@ -359,27 +391,48 @@ void HmpConfig::WriteGen(FILE *pF) } if(fGenBG->GetButton(kHijing)->GetState()==kButtonDown){//normal HIJING - fprintf(pF," AliGenHijing *pH=new AliGenHijing(-1); pH->SetEnergyCMS(14000); pH->SetReferenceFrame(\"CMS\");\n"); - fprintf(pF," pH->SetProjectile(\"P\", 1, 1); pH->SetTarget(\"P\", 1, 1 ); pH->SetJetQuenching(0);\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"); + fprintf(pF," AliGenerator *gener = (AliGenerator*)pH; \n"); + fprintf(pF," gener->SetOrigin(0, 0, 0); // vertex position \n"); + fprintf(pF," gener->SetSigma(0, 0, 5.3); // Sigma in (X,Y,Z) (cm) on IP position \n"); + fprintf(pF," gener->SetCutVertexZ(1.); // Truncate at 1 sigma \n"); + fprintf(pF," gener->SetVertexSmear(kPerEvent); \n"); + fprintf(pF," gener->SetTrackingFlag(1); \n"); + fprintf(pF," gener->Init(); \n\n"); } if(fGenBG->GetButton(kHijingPara)->GetState()==kButtonDown){//parametrized HIJING 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," AliGenerator *gener = (AliGenerator*)pHP; \n"); + fprintf(pF," gener->SetOrigin(0, 0, 0); // vertex position \n"); + fprintf(pF," gener->SetSigma(0, 0, 5.3); // Sigma in (X,Y,Z) (cm) on IP position \n"); + fprintf(pF," gener->SetCutVertexZ(1.); // Truncate at 1 sigma \n"); + fprintf(pF," gener->SetVertexSmear(kPerEvent); \n"); + fprintf(pF," gener->SetTrackingFlag(1); \n"); + fprintf(pF," gener->Init(); \n\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->SetMomentumRange(0,999);\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," AliGenerator *gener = (AliGenerator*)pP; \n"); + fprintf(pF," gener->SetOrigin(0, 0, 0); // vertex position \n"); + fprintf(pF," gener->SetSigma(0, 0, 5.3); // Sigma in (X,Y,Z) (cm) on IP position \n"); + fprintf(pF," gener->SetCutVertexZ(1.); // Truncate at 1 sigma \n"); + fprintf(pF," gener->SetVertexSmear(kPerEvent); \n"); + fprintf(pF," gener->SetTrackingFlag(1); \n"); + fprintf(pF," gener->Init(); \n\n"); } - fprintf(pF," pG->Init();\n\n"); + if(fGenBG->GetButton(kHijing)->GetState()==kButtonDown || + fGenBG->GetButton(kHijingPara)->GetState()==kButtonDown || + fGenBG->GetButton(kPythia)->GetState()==kButtonDown) continue; + else fprintf(pF," pG->Init();\n\n"); }//WriteGenerator() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void HmpConfig::GuiDet(TGHorizontalFrame *pMainHF) @@ -413,36 +466,34 @@ void HmpConfig::DetRemSlot(Int_t id) void HmpConfig::WriteDet(FILE *pF) { //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(kFALSE);\n"); - fprintf(pF," pIts->SetThicknessDet1(200.); pIts->SetThicknessDet2(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(kPIPE )->GetState()) fprintf(pF,"\n new AliPIPEv3(\"PIPE\",\"Beam Pipe\");\n"); + if(fDetBG->GetButton(kSHILD)->GetState()) fprintf(pF,"\n new AliSHILv3(\"SHIL\",\"Shielding Version 2\");\n"); + if(fDetBG->GetButton(kITS )->GetState()) fprintf(pF,"\n new AliITSv11Hybrid(\"ITS\",\"ITS v11Hybrid\");\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"); + if(fDetBG->GetButton(kTOF )->GetState()) { + fprintf(pF,"\n AliTOF *TOF = new AliTOFv6T0(\"TOF\", \"normal TOF\");\n"); + fprintf(pF,"\n Int_t TOFSectors[18]={-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0,-1,-1,0,0,0};\n"); + fprintf(pF,"\n TOF->SetTOFSectors(TOFSectors);\n"); + } //central detectors behind HMPID 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 - if(fDetBG->GetButton(kFMD )->GetState()) fprintf(pF,"\n new AliFMDv1(\"FMD\",\"normal FMD\");\n"); - if(fDetBG->GetButton(kABSO )->GetState()) fprintf(pF,"\n new AliABSOv0(\"ABSO\",\"Muon absorber\");\n"); - if(fDetBG->GetButton(kDIPO )->GetState()) fprintf(pF,"\n new AliDIPOv2(\"DIPO\",\"Dipole version 2\");\n"); - if(fDetBG->GetButton(kMUON )->GetState()) fprintf(pF,"\n new AliMUONv1(\"MUON\",\"default\");\n"); - if(fDetBG->GetButton(kPMD )->GetState()) fprintf(pF,"\n new AliPMDv1(\"PMD\",\"normal PMD\");\n"); - if(fDetBG->GetButton(kT0)->GetState()) fprintf(pF,"\n new AliT0v1(\"T0\",\"T0 Detector\");\n"); - if(fDetBG->GetButton(kVZERO)->GetState()) fprintf(pF,"\n new AliVZEROv2(\"VZERO\",\"normal VZERO\");\n"); - if(fDetBG->GetButton(kZDC )->GetState()) fprintf(pF,"\n new AliZDCv2(\"ZDC\",\"normal ZDC\");\n"); + if(fDetBG->GetButton(kFMD )->GetState()) fprintf(pF,"\n AliFMD *FMD = new AliFMDv1(\"FMD\",\"normal FMD\");\n"); + if(fDetBG->GetButton(kABSO )->GetState()) fprintf(pF,"\n AliABSO *ABSO = new AliABSOv3(\"ABSO\",\"Muon absorber\");\n"); + if(fDetBG->GetButton(kDIPO )->GetState()) fprintf(pF,"\n AliDIPO *DIPO = new AliDIPOv3(\"DIPO\",\"Dipole version 3\");\n"); + if(fDetBG->GetButton(kMUON )->GetState()) fprintf(pF,"\n AliMUON *MUON = new AliMUONv1(\"MUON\",\"default\");\n"); + if(fDetBG->GetButton(kPMD )->GetState()) fprintf(pF,"\n AliPMD *PMD = new AliPMDv1(\"PMD\",\"normal PMD\");\n"); + if(fDetBG->GetButton(kT0)->GetState()) fprintf(pF,"\n AliT0 *T0 = new AliT0v1(\"T0\",\"T0 Detector\");\n"); + if(fDetBG->GetButton(kVZERO)->GetState()) fprintf(pF,"\n AliVZERO *VZERO = new AliVZEROv7(\"VZERO\",\"normal VZERO\");\n"); + if(fDetBG->GetButton(kZDC )->GetState()) fprintf(pF,"\n AliZDC *ZDC = new AliZDCv2(\"ZDC\",\"normal ZDC\");\n"); //different phase space detectors - if(fDetBG->GetButton(kPHOS )->GetState()) fprintf(pF,"\n new AliPHOSv1(\"PHOS\",\"IHEP\");\n"); - if(fDetBG->GetButton(kEMCAL)->GetState()) fprintf(pF,"\n new AliEMCALv1(\"EMCAL\",\"G56_2_55_19_104_14\");\n"); - if(fDetBG->GetButton(kACORDE )->GetState()) fprintf(pF,"\n new AliACORDEv0(\"ACORDE\",\"normal ACORDE\");\n"); + if(fDetBG->GetButton(kPHOS )->GetState()) fprintf(pF,"\n AliPHOS *PHOS = new AliPHOSv1(\"PHOS\",\"IHEP\");\n"); + if(fDetBG->GetButton(kEMCAL)->GetState()) fprintf(pF,"\n AliEMCAL *EMCAL = new AliEMCALv2(\"EMCAL\",\"SHISH_77_TRD1_2X2_FINAL_110DEG\");\n"); + if(fDetBG->GetButton(kACORDE )->GetState()) fprintf(pF,"\n AliACORDE *ACORDE = new AliACORDEv1(\"ACORDE\",\"normal ACORDE\");\n"); } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void HmpConfig::GuiBatch(TGHorizontalFrame *pMainF) @@ -477,6 +528,9 @@ void HmpConfig::GuiBatch(TGHorizontalFrame *pMainF) new TGRadioButton(fCluBG, "No Clusters" ,kNo ); new TGRadioButton(fCluBG, "Clusters CORE" ,kAll ); new TGRadioButton(fCluBG, "Clusters HMPID" ,kHmp ); + + new TGCheckButton(fTrkBG, "Apply RecoParam" ,kRecoPar); + new TGCheckButton(fTrkBG, "Load Align data" ,kAln ); new TGCheckButton(fTrkBG, "Prim vertex" ,kVtx ); new TGCheckButton(fTrkBG, "ESD tracks" ,kTrk ); @@ -533,6 +587,7 @@ void HmpConfig::SlotRec(Bool_t isChk) fCluBG->GetButton(kAll)->SetState(kButtonEngaged); fCluBG->GetButton(kHmp)->SetState(kButtonDown); + fTrkBG->GetButton(kRecoPar)->SetState(kButtonEngaged); fTrkBG->GetButton(kAln)->SetState(kButtonEngaged); fTrkBG->GetButton(kVtx)->SetState(kButtonEngaged); fTrkBG->GetButton(kTrk)->SetState(kButtonEngaged); @@ -547,6 +602,7 @@ void HmpConfig::SlotRec(Bool_t isChk) fCluBG->GetButton(kAll)->SetState(kButtonDisabled); fCluBG->GetButton(kHmp)->SetState(kButtonDisabled); + fTrkBG->GetButton(kRecoPar)->SetState(kButtonDisabled); fTrkBG->GetButton(kAln)->SetState(kButtonDisabled); fTrkBG->GetButton(kVtx)->SetState(kButtonDisabled); fTrkBG->GetButton(kTrk)->SetState(kButtonDisabled); @@ -568,70 +624,116 @@ void HmpConfig::SlotBatch(Int_t id) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void HmpConfig::WriteBatch() {//creates Batch.C file - char *sBatchName="Hbatch"; - FILE *fp=fopen(Form("%s.C",sBatchName),"w"); if(!fp){Info("CreateBatch","Cannot open output file: %s.C",sBatchName);return;} + TString det; + if(fDetBG->GetButton(kITS )->GetState()) det+="ITS "; + if(fDetBG->GetButton(kTPC )->GetState()) det+="TPC "; + if(fDetBG->GetButton(kTRD )->GetState()) det+="TRD "; + if(fDetBG->GetButton(kTOF )->GetState()) det+="TOF "; + if(!fVerBG->GetButton(kNo)->GetState()) det+="HMPID "; + char *sBatchName="sim"; + FILE *fp=fopen(Form("%s.C",sBatchName),"w"); if(!fp){Info("CreateSim","Cannot open output file: %s.C",sBatchName);return;} - fprintf(fp,"void %s(Int_t iNevt,Bool_t isDbg,char *sCfg)\n{\n",sBatchName); - fprintf(fp," gSystem->Exec(\"rm -rf hlt hough gphysi* fort* ZZZ*\"); //remove garbage\n"); + fprintf(fp,"void %s(Int_t iNevt=1,Bool_t isDbg=kFALSE,char *sCfg=\"Config.C\")\n{\n",sBatchName); + fprintf(fp," gSystem->Exec(\"rm -rf hlt hough gphysi* fort* ZZZ* raw*\"); //remove garbage\n"); fprintf(fp," gBenchmark->Start(\"ALICE\"); TDatime time; //start benchmarking\n\n"); fprintf(fp," if(isDbg) AliLog::SetGlobalDebugLevel(AliLog::kDebug);\n"); //simulation section - if(fSimB->GetState()){ - fprintf(fp," gSystem->Exec(\"rm -rf *.root \"); //remove previous simulation\n"); + if(fSimB->GetState()){ fprintf(fp," gSystem->Exec(\"rm -rf *.root \"); //remove previous simulation\n"); + fprintf(fp," gSystem->Exec(\"rm -rf *.date \"); //remove previous simulation\n"); fprintf(fp," AliSimulation *pSim=new AliSimulation(sCfg); //init simulation\n"); if(fTraB->GetState()) fprintf(fp," pSim->SetRunSimulation(kTRUE); //transport and hits creation\n"); else fprintf(fp," pSim->SetRunSimulation(kFALSE); //no transport and hits creation\n"); if (fSdiBG->GetButton(kNo )->GetState()) fprintf(fp," pSim->SetMakeSDigits(\"\"); //no sdigits\n"); - else if(fSdiBG->GetButton(kAll)->GetState()) fprintf(fp," pSim->SetMakeSDigits(\"ALL\"); //sdigits for all\n"); + else if(fSdiBG->GetButton(kAll)->GetState()) fprintf(fp," pSim->SetMakeSDigits(\"%s\"); //sdigits for all\n",det.Data()); else if(fSdiBG->GetButton(kHmp)->GetState()) fprintf(fp," pSim->SetMakeSDigits(\"HMPID\"); //sdigits for HMPID\n"); if (fDigBG->GetButton(kNo )->GetState()) fprintf(fp," pSim->SetMakeDigits(\"\"); //no digits\n"); - else if(fDigBG->GetButton(kAll)->GetState()) fprintf(fp," pSim->SetMakeDigits(\"ALL\"); //digits for all\n"); + else if(fDigBG->GetButton(kAll)->GetState()) fprintf(fp," pSim->SetMakeDigits(\"%s\"); //digits for all\n",det.Data()); else if(fDigBG->GetButton(kHmp)->GetState()) fprintf(fp," pSim->SetMakeDigits(\"HMPID\"); //digits for HMPID\n"); - if (fRawBG->GetButton(kDdl)->GetState()) fprintf(fp," pSim->SetWriteRawData(\"ALL\"); //raw data as DDL\n"); - else if(fRawBG->GetButton(kDat)->GetState()) fprintf(fp," pSim->SetWriteRawData(\"ALL\",\"raw.date\"); //raw data as DATE\n"); - else if(fRawBG->GetButton(kRoo)->GetState()) fprintf(fp," pSim->SetWriteRawData(\"ALL\",\"raw.root\"); //raw data as ROOT\n"); - - fprintf(fp," pSim->Run(iNevt); //run iNevt events\n delete pSim;\n\n"); - }//sim section + if (fRawBG->GetButton(kDdl)->GetState()) fprintf(fp," pSim->SetWriteRawData(\"%s\"); //raw data as DDL\n",det.Data()); + else if(fRawBG->GetButton(kDat)->GetState()) fprintf(fp," pSim->SetWriteRawData(\"%s\",\"raw.date\"); //raw data as DATE\n",det.Data()); + else if(fRawBG->GetButton(kRoo)->GetState()) fprintf(fp," pSim->SetWriteRawData(\"%s\",\"raw.root\"); //raw data as ROOT\n",det.Data()); + fprintf(fp," pSim->SetRunHLT(\"\"); //no HLT stuff\n"); + fprintf(fp," pSim->SetRunQA(\":\"); //no QA\n"); + fprintf(fp," pSim->Run(iNevt); //run iNevt events\n delete pSim;\n\n"); + }//sim section + fprintf(fp," cout<<\"!!!!!!!!!!!!Info in : Start time: \";time.Print();\n"); + fprintf(fp," cout<<\"!!!!!!!!!!!!Info in : Stop time: \";time.Set(); time.Print();\n"); + fprintf(fp," gBenchmark->Show(\"ALICE\");\n"); + + fprintf(fp," gSystem->Exec(\"touch ZZZ______finished_______SSS\");\n"); + fprintf(fp," gSystem->Exec(\"aliroot -q rec.C &\");\n}\n"); + fclose(fp); +// rec section + char *sBatchName="rec"; + FILE *fp=fopen(Form("%s.C",sBatchName),"w"); if(!fp){Info("CreateRec","Cannot open output file: %s.C",sBatchName);return;} + + fprintf(fp,"void %s()\n{\n",sBatchName); + fprintf(fp," gSystem->Exec(\"rm -rf *RRR \"); //remove garbage\n"); if(fRecB->GetState()){ +/* + if(fMagBG->GetButton(kFld0)->GetState()) fprintf(fp," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 0,1,10.,2));//no field\n"); + else if(fMagBG->GetButton(kFld2)->GetState()) fprintf(fp," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 1,1,10,AliMagF::k2kG));//0.2 Tesla field\n"); + else if(fMagBG->GetButton(kFld4)->GetState()) fprintf(fp," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 1,1,10,AliMagF::k4kG));//0.4 Tesla field\n"); + else if(fMagBG->GetButton(kFld5)->GetState()) fprintf(fp," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 1,1,10,AliMagF::k5kG));//0.5 Tesla field\n"); + else if(fMagBG->GetButton(kFld_2)->GetState()) fprintf(fp," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k2kG));//-0.2 Tesla field\n"); + else if(fMagBG->GetButton(kFld_4)->GetState()) fprintf(fp," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k4kG));//-0.4 Tesla field\n"); + else if(fMagBG->GetButton(kFld_5)->GetState()) fprintf(fp," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k5kG));//-0.5 Tesla field\n"); +*/ fprintf(fp," AliReconstruction *pRec=new AliReconstruction;\n"); + fprintf(fp," gBenchmark->Start(\"ALICE\"); TDatime time; //start benchmarking\n\n"); + + //--------------------------------------------- + if (fTrkBG->GetButton(kRecoPar)->GetState()) + { + fprintf(fp," AliHMPIDRecoParam *hmpidRecoParam=AliHMPIDReconstructor::GetRecoParam(); //Get the HMPID reco param\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(0,4); //eg cut for UserCutSigma (Values: ch0)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(1,4); //eg cut for UserCutSigma (Values: ch1)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(2,4); //eg cut for UserCutSigma (Values: ch2)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(3,4); //eg cut for UserCutSigma (Values: ch3)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(4,4); //eg cut for UserCutSigma (Values: ch4)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(5,4); //eg cut for UserCutSigma (Values: ch5)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(6,4); //eg cut for UserCutSigma (Values: ch6)\n"); + fprintf(fp," AliHMPIDReconstructor::SetRecoParam(hmpidRecoParam); //Pass the RecoPar to the Reconstructor\n"); + } + //--------------------------------------------- if (fInpBG->GetButton(kNo )->GetState()) fprintf(fp," pRec->SetInput(\"\"); //from digits\n"); else if(fInpBG->GetButton(kDdl)->GetState()) fprintf(fp," pRec->SetInput(\"./\"); //from raw data in DDL format\n"); - else if(fInpBG->GetButton(kDat)->GetState()) fprintf(fp," pRec->SetInput(\"raw.root.date\"); //from raw data in DATE format\n"); + else if(fInpBG->GetButton(kDat)->GetState()) fprintf(fp," pRec->SetInput(\"raw.date\"); //from raw data in DATE format\n"); else if(fInpBG->GetButton(kRoo)->GetState()) fprintf(fp," pRec->SetInput(\"raw.root\"); //from raw data in ROOT format\n"); - if (fCluBG->GetButton(kAll) ->GetState()) fprintf(fp," pRec->SetRunLocalReconstruction(\"ALL\"); //clusters for all detectors\n"); + if (fCluBG->GetButton(kAll) ->GetState()) fprintf(fp," pRec->SetRunLocalReconstruction(\"%s\"); //clusters for all detectors\n",det.Data()); else if(fCluBG->GetButton(kHmp) ->GetState()) fprintf(fp," pRec->SetRunLocalReconstruction(\"HMPID\"); //clusters for HMPID only\n"); else if(fCluBG->GetButton(kNo) ->GetState()) fprintf(fp," pRec->SetRunLocalReconstruction(\"\"); //no clusters\n"); - if (fTrkBG->GetButton(kAln)->GetState()) fprintf(fp," pRec->SetLoadAlignData(\"ALL\"); //with misalignment\n"); + + + if (fTrkBG->GetButton(kAln)->GetState()) fprintf(fp," pRec->SetLoadAlignData(\"%s\"); //with misalignment\n",det.Data()); else fprintf(fp," pRec->SetLoadAlignData(\"\"); //no misalignment\n"); if (fTrkBG->GetButton(kVtx)->GetState()) fprintf(fp," pRec->SetRunVertexFinder(kTRUE); //primary vertex\n"); else fprintf(fp," pRec->SetRunVertexFinder(kFALSE); //no primary vertex\n"); - if (fTrkBG->GetButton(kTrk) ->GetState()) fprintf(fp," pRec->SetRunTracking(\"ALL\"); //tracking\n"); + if (fTrkBG->GetButton(kTrk) ->GetState()) fprintf(fp," pRec->SetRunTracking(\"%s\"); //tracking\n",det.Data()); else fprintf(fp," pRec->SetRunTracking(\"\"); //no tracking\n"); - if (fTrkBG->GetButton(kPid) ->GetState()) fprintf(fp," pRec->SetFillESD(\"ALL\"); //prob vect\n"); + if (fTrkBG->GetButton(kPid) ->GetState()) fprintf(fp," pRec->SetFillESD(\"%s\"); //prob vect\n",det.Data()); else fprintf(fp," pRec->SetFillESD(\"\"); //no prob vect\n"); fprintf(fp," pRec->Run();delete pRec;\n\n"); }//rec part //benchmarks - fprintf(fp," cout<<\"!!!!!!!!!!!!Info in : Start time: \";time.Print();\n"); - fprintf(fp," cout<<\"!!!!!!!!!!!!Info in : Stop time: \";time.Set(); time.Print();\n"); + fprintf(fp," cout<<\"!!!!!!!!!!!!Info in : Start time: \";time.Print();\n"); + fprintf(fp," cout<<\"!!!!!!!!!!!!Info in : Stop time: \";time.Set(); time.Print();\n"); fprintf(fp," gBenchmark->Show(\"ALICE\");\n"); - fprintf(fp," gSystem->Exec(\"play -c 2 ~/my/end.wav\");\n"); - fprintf(fp," gSystem->Exec(\"touch ZZZ______finished_______ZZZ\");\n}\n"); + fprintf(fp," gSystem->Exec(\"touch ZZZ______finished_______RRR\");\n}\n"); fclose(fp); }//WriteBatch() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -653,17 +755,22 @@ void HmpConfig::WriteConfig() fprintf(pF,"\n ::Info(\"\\n\\n\\n----------> HMPID private config\",\"Start\");\n"); //Random fprintf(pF," gRandom->SetSeed(123456);//put 0 to use system time\n\n"); -//Geant - fprintf(pF," gSystem->Load(\"libgeant321\");\n"); - fprintf(pF," new TGeant3TGeo(\"C++ Interface to Geant3\");\n\n"); //File fprintf(pF," AliRunLoader *pAL=AliRunLoader::Open(\"galice.root\",AliConfig::GetDefaultEventFolderName(),\"recreate\");\n"); fprintf(pF," pAL->SetCompressionLevel(2);\n"); fprintf(pF," pAL->SetNumberOfEventsPerFile(1000);\n"); fprintf(pF," gAlice->SetRunLoader(pAL);\n\n"); //Decayer - if(fDecayerB->GetState()==kButtonDown){ - fprintf(pF," TVirtualMCDecayer *pDecayer=new AliDecayerPythia();\n"); + if(fDecayerB->GetState()==kButtonDown){ + fprintf(pF," gSystem->Load(\"liblhapdf.so\"); // Parton density functions \n"); + fprintf(pF," gSystem->Load(\"libEGPythia6.so\"); // TGenerator interface \n"); + fprintf(pF," gSystem->Load(\"libpythia6.so\"); // Pythia \n"); + fprintf(pF," gSystem->Load(\"libAliPythia6.so\"); // ALICE specifics implementations \n\n"); +//Geant + fprintf(pF," gSystem->Load(\"libgeant321\");\n"); + fprintf(pF," new TGeant3TGeo(\"C++ Interface to Geant3\");\n\n"); + + fprintf(pF," AliDecayer *pDecayer=new AliDecayerPythia();\n"); fprintf(pF," pDecayer->SetForceDecay(kAll);\n"); fprintf(pF," pDecayer->Init();\n"); fprintf(pF," gMC->SetExternalDecayer(pDecayer);\n\n"); @@ -671,13 +778,13 @@ void HmpConfig::WriteConfig() 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(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"); + if(fMagBG->GetButton(kFld0)->GetState()) fprintf(pF," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 0,1,10,AliMagF::k2kG));// NO field\n"); + else if(fMagBG->GetButton(kFld2)->GetState()) fprintf(pF," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 1,1,10,AliMagF::k2kG));//0.2 Tesla field\n"); + else if(fMagBG->GetButton(kFld4)->GetState()) fprintf(pF," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 1,1,10,AliMagF::k4kG));//0.4 Tesla field\n"); + else if(fMagBG->GetButton(kFld5)->GetState()) fprintf(pF," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 1,1,10,AliMagF::k5kG));//0.5 Tesla field\n"); + else if(fMagBG->GetButton(kFld_2)->GetState()) fprintf(pF," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k2kG));//-0.2 Tesla field\n"); + else if(fMagBG->GetButton(kFld_4)->GetState()) fprintf(pF," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k4kG));//-0.4 Tesla field\n"); + else if(fMagBG->GetButton(kFld_5)->GetState()) fprintf(pF," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k5kG));//-0.5 Tesla field\n"); fprintf(pF," pAL->CdGAFile();\n\n"); //???? //Generator @@ -688,7 +795,8 @@ void HmpConfig::WriteConfig() WriteHmp(pF); //private HMPID part WriteDet(pF); //other detectors //end of Config.C file: - fprintf(pF,"\n ::Info(\"----------> HMPID private config\",\"Stop\\n\\n\\n\");\n"); + fprintf(pF,"\n ::Info(\"----------> HMPID private config\",\"Stop\\n\\n\\n\");\n"); +// fprintf(pF,"}\n"); fclose(pF); }//WriteConfig()