From: shahoian Date: Sun, 2 Mar 2014 23:15:01 +0000 (+0100) Subject: commit to clean dev branch X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=4e6eb3f6ff8f346e7fef20ed18daa7ff2111bed8 commit to clean dev branch --- diff --git a/ITS/UPGRADE/Detector.cxx b/ITS/UPGRADE/Detector.cxx index e2828b0f3b5..4e9e8568911 100644 --- a/ITS/UPGRADE/Detector.cxx +++ b/ITS/UPGRADE/Detector.cxx @@ -1542,12 +1542,12 @@ void Detector::MakeAliceCurrent(Int_t AlignResiduals, Bool_t flagTPC) { } else if (AlignResiduals==2) { - // tracking errors ... PLUS ... module misalignment + // tracking errors ... PLUS ... chip misalignment // itsRecoParam->SetClusterMisalErrorYBOn(0.0010,0.0030,0.0500,0.0500,0.0020,0.0020); // [cm] // itsRecoParam->SetClusterMisalErrorZBOn(0.0050,0.0050,0.0050,0.0050,0.1000,0.1000); - // the ITS modules are misalignment with small gaussian smearings with + // the ITS chips are misalignment with small gaussian smearings with // sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD AddLayer((char*)"spd1", 3.9, 0.0114, TMath::Sqrt(0.0012*0.0012+0.0010*0.0010+0.0008*0.0008), @@ -1565,7 +1565,7 @@ void Detector::MakeAliceCurrent(Int_t AlignResiduals, Bool_t flagTPC) { } else { - // the ITS modules are misalignment with small gaussian smearings with + // the ITS chips are misalignment with small gaussian smearings with // sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD // unknown in Z ???? diff --git a/ITS/UPGRADE/DetectorK.cxx b/ITS/UPGRADE/DetectorK.cxx index a52c2b11fe2..b0868c0e532 100644 --- a/ITS/UPGRADE/DetectorK.cxx +++ b/ITS/UPGRADE/DetectorK.cxx @@ -1844,12 +1844,12 @@ void DetectorK::MakeAliceCurrent(Int_t AlignResiduals, Bool_t flagTPC) { } else if (AlignResiduals==2) { - // tracking errors ... PLUS ... module misalignment + // tracking errors ... PLUS ... chip misalignment // itsRecoParam->SetClusterMisalErrorYBOn(0.0010,0.0030,0.0500,0.0500,0.0020,0.0020); // [cm] // itsRecoParam->SetClusterMisalErrorZBOn(0.0050,0.0050,0.0050,0.0050,0.1000,0.1000); - // the ITS modules are misalignment with small gaussian smearings with + // the ITS chips are misalignment with small gaussian smearings with // sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD AddLayer((char*)"spd1", 3.9, 0.0114, TMath::Sqrt(0.0012*0.0012+0.0010*0.0010+0.0008*0.0008), @@ -1867,7 +1867,7 @@ void DetectorK::MakeAliceCurrent(Int_t AlignResiduals, Bool_t flagTPC) { } else { - // the ITS modules are misalignment with small gaussian smearings with + // the ITS chips are misalignment with small gaussian smearings with // sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD // unknown in Z ???? diff --git a/ITS/UPGRADE/KMCDetector.cxx b/ITS/UPGRADE/KMCDetector.cxx index 1c9ce095d67..22786adadaa 100755 --- a/ITS/UPGRADE/KMCDetector.cxx +++ b/ITS/UPGRADE/KMCDetector.cxx @@ -1724,12 +1724,12 @@ void KMCDetector::MakeAliceCurrent(Bool_t flagTPC, Int_t AlignResiduals) { } else if (AlignResiduals==2) { - // tracking errors ... PLUS ... module misalignment + // tracking errors ... PLUS ... chip misalignment // itsRecoParam->SetClusterMisalErrorYBOn(0.0010,0.0030,0.0500,0.0500,0.0020,0.0020); // [cm] // itsRecoParam->SetClusterMisalErrorZBOn(0.0050,0.0050,0.0050,0.0050,0.1000,0.1000); - // the ITS modules are misalignment with small gaussian smearings with + // the ITS chips are misalignment with small gaussian smearings with // sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD AddLayer((char*)"spd1_its", 3.9, 0.0114, 2.48e-01, TMath::Sqrt(0.0012*0.0012+0.0010*0.0010+0.0008*0.0008), @@ -1747,7 +1747,7 @@ void KMCDetector::MakeAliceCurrent(Bool_t flagTPC, Int_t AlignResiduals) { } else { - // the ITS modules are misalignment with small gaussian smearings with + // the ITS chips are misalignment with small gaussian smearings with // sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD // unknown in Z ???? diff --git a/ITS/UPGRADE/v0/AliITSUpgradeReconstructor.cxx b/ITS/UPGRADE/v0/AliITSUpgradeReconstructor.cxx index 859d85785b4..ecee8685970 100644 --- a/ITS/UPGRADE/v0/AliITSUpgradeReconstructor.cxx +++ b/ITS/UPGRADE/v0/AliITSUpgradeReconstructor.cxx @@ -26,7 +26,7 @@ #include "AliITSReconstructor.h" #include "AliITSupgrade.h" #include "AliITSUpgradeReconstructor.h" //class header -#include "AliITSDetTypeRec.h" +#include "AliITSChipTypeRec.h" #include "AliITS.h" //Reconstruct() #include "AliESDEvent.h" //FillEsd() #include "AliRawReader.h" //Reconstruct() for raw digits diff --git a/TPC/Rec/AliTPCtrack.cxx b/TPC/Rec/AliTPCtrack.cxx index 1401ccaa285..9ed3e1fe966 100644 --- a/TPC/Rec/AliTPCtrack.cxx +++ b/TPC/Rec/AliTPCtrack.cxx @@ -158,7 +158,7 @@ AliTPCtrack::AliTPCtrack(const AliESDtrack& t, TTreeSRedirector *pcstream) : const AliExternalTrackParam *tpcin = t.GetInnerParam(); const AliExternalTrackParam *tpc=(tpcout)?tpcout:tpcin; if (!tpc) tpc=¶m; - Bool_t isOK=recoParam->GetUseOuterDetectors(); + Bool_t isOK=kTRUE;// RS recoParam->GetUseOuterDetectors(); if (param.GetCovariance()[0]>kmaxC[0]*kmaxC[0]) isOK=kFALSE; if (param.GetCovariance()[2]>kmaxC[1]*kmaxC[1]) isOK=kFALSE; if (param.GetCovariance()[5]>kmaxC[2]*kmaxC[2]) isOK=kFALSE; diff --git a/TPC/Rec/AliTPCtracker.cxx b/TPC/Rec/AliTPCtracker.cxx index f20a07ad2a0..8184c0701a9 100644 --- a/TPC/Rec/AliTPCtracker.cxx +++ b/TPC/Rec/AliTPCtracker.cxx @@ -3261,6 +3261,7 @@ void AliTPCtracker::ReadSeeds(const AliESDEvent *const event, Int_t direction) } if (((status&AliESDtrack::kITSout)==0)&&(direction==1)) seed->ResetCovariance(10.); + //RS if ( direction ==2 &&(status & AliESDtrack::kTRDrefit) == 0 ) seed->ResetCovariance(10.); if ( direction ==2 &&(status & AliESDtrack::kTRDrefit) == 0 ) seed->ResetCovariance(10.); //if ( direction ==2 && ((status & AliESDtrack::kTPCout) == 0) ) { // fSeeds->AddAt(0,i); @@ -7935,6 +7936,7 @@ Bool_t AliTPCtracker::IsFindable(AliTPCseed & track){ void AliTPCtracker::AddCovariance(AliTPCseed * seed){ // + return; // Adding systematic error estimate to the covariance matrix // !!!! the systematic error for element 4 is in 1/GeV // 03.03.2012 MI changed in respect to the previous versions diff --git a/TRD/AliTRDseedV1.cxx b/TRD/AliTRDseedV1.cxx index 2babc75a58f..7063ab09dbd 100644 --- a/TRD/AliTRDseedV1.cxx +++ b/TRD/AliTRDseedV1.cxx @@ -850,13 +850,14 @@ void AliTRDseedV1::GetCovAt(Double_t x, Double_t *cov) const //GetPadLength()*GetPadLength()/12.; // insert systematic uncertainties + /* //RS if(fkReconstructor){ Double_t sys[15]; memset(sys, 0, 15*sizeof(Double_t)); fkReconstructor->GetRecoParam()->GetSysCovMatrix(sys); sy2 += sys[0]; sz2 += sys[1]; } - + */ // rotate covariance matrix if no RC if(!IsRowCross()){ Double_t t2 = GetTilt()*GetTilt(); @@ -2072,7 +2073,7 @@ Bool_t AliTRDseedV1::FitRobust(Bool_t chg) if(!attach){ AliWarning("No usable AttachClusters calib object."); } else { - kScalePulls = attach->GetScaleCov();//*lyScaler; + // kScalePulls = attach->GetScaleCov();//*lyScaler; } // Retrieve chamber status SetChmbGood(calibration->IsChamberGood(fDet)); diff --git a/TRD/AliTRDtrackV1.cxx b/TRD/AliTRDtrackV1.cxx index 52090dc61af..4921d25bf9c 100644 --- a/TRD/AliTRDtrackV1.cxx +++ b/TRD/AliTRDtrackV1.cxx @@ -145,6 +145,7 @@ AliTRDtrackV1::AliTRDtrackV1(const AliESDtrack &t) : AliKalmanTrack() for(int is =0; isGetX() ,par->GetAlpha() ,par->GetParameter() diff --git a/TRD/AliTRDtrackerV1.cxx b/TRD/AliTRDtrackerV1.cxx index 3dbadd98800..0bcecd7cef6 100644 --- a/TRD/AliTRDtrackerV1.cxx +++ b/TRD/AliTRDtrackerV1.cxx @@ -582,6 +582,7 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t) AliDebug(1, Form("Tracklet Det[%d] !OK", tracklet->GetDetector())); continue; } + tracklet->FitRobust(); Double_t x = tracklet->GetX();//GetX0(); // reject tracklets which are not considered for inward refit if(x > t.GetX()+AliTRDReconstructor::GetMaxStep()) continue; diff --git a/test/ppbench/aod.C b/test/ppbench/aod.C deleted file mode 100644 index 911379c34bd..00000000000 --- a/test/ppbench/aod.C +++ /dev/null @@ -1,13 +0,0 @@ -void aod(){ - - gSystem->Load("libANALYSIS"); - gSystem->Load("libANALYSISalice"); - gSystem->Load("libCORRFW"); - gSystem->Load("libPWGHFbase"); - gSystem->Load("libPWGmuon"); - gSystem->Load("libESDfilter"); - gSystem->Load("libTENDER"); - gSystem->Load("libPWGPP"); - - gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")"); -} diff --git a/test/ppbench/recraw/aod.C b/test/ppbench/recraw/aod.C deleted file mode 100644 index 55bfd5f804c..00000000000 --- a/test/ppbench/recraw/aod.C +++ /dev/null @@ -1,13 +0,0 @@ -void aod(){ - - gSystem->Load("libANALYSIS"); - gSystem->Load("libANALYSISalice"); - gSystem->Load("libCORRFW"); - gSystem->Load("libPWGHFbase"); - gSystem->Load("libPWGmuon"); - gSystem->Load("libESDfilter"); - gSystem->Load("libTENDER"); - gSystem->Load("libPWGPP"); - - gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)"); -} diff --git a/test/ppbench/recraw/rec.C b/test/ppbench/recraw/rec.C deleted file mode 100644 index 285ef55a968..00000000000 --- a/test/ppbench/recraw/rec.C +++ /dev/null @@ -1,32 +0,0 @@ -void rec() { - - AliReconstruction reco; - - reco.SetWriteESDfriend(); - reco.SetWriteAlignmentData(); - - reco.SetInput("raw.root"); - - reco.SetNumberOfEventsPerFile(-1); // all events in one single file - - reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB"); - reco.SetSpecificStorage("GRP/GRP/Data", - Form("local://%s/..",gSystem->pwd())); - reco.SetRunPlaneEff(kTRUE); - - reco.SetRunReconstruction("ALL") ; - reco.SetRunQA("ALL:ALL") ; - - reco.SetQARefDefaultStorage("local://$ALICE_ROOT/QAref") ; - - for (Int_t det = 0 ; det < AliQA::kNDET ; det++) { - reco.SetQACycles((AliQAv1::DETECTORINDEX_t)det, 999) ; - reco.SetQAWriteExpert((AliQAv1::DETECTORINDEX_t)det) ; - } - - TStopwatch timer; - timer.Start(); - reco.Run(); - timer.Stop(); - timer.Print(); -} diff --git a/test/ppbench/sim.C b/test/ppbench/sim.C index baf8eeb7453..ac835873dd0 100644 --- a/test/ppbench/sim.C +++ b/test/ppbench/sim.C @@ -20,6 +20,10 @@ void sim(Int_t nev=20) { simulator.SetSpecificStorage("GRP/GRP/Data", Form("local://%s",gSystem->pwd())); + simulator.SetSpecificStorage("ITS/Align/Data", + Form("local://%s",gSystem->pwd())); + + simulator.SetRunQA("ALL:ALL") ; simulator.SetQARefDefaultStorage("local://$ALICE_ROOT/QAref") ;