- fix
authorcholm <Christian.Holm.Christensen@cern.ch>
Fri, 11 Apr 2014 15:34:54 +0000 (17:34 +0200)
committercholm <Christian.Holm.Christensen@cern.ch>
Fri, 11 Apr 2014 15:34:54 +0000 (17:34 +0200)
Conflicts:
PWGGA/GammaConv/AliConversionCuts.cxx

PWGGA/GammaConv/AliConversionCuts.cxx

index 81c17c3..93a5230 100644 (file)
@@ -3766,18 +3766,14 @@ void AliConversionCuts::GetNotRejectedParticles(Int_t rejection, TList *HeaderLi
                                gh = (AliGenEventHeader*)genHeaders->At(i);
                                TString GeneratorName = gh->GetName();
                                lastindexA = lastindexA + gh->NProduced();
-//                             cout << i << "\t" << GeneratorName.Data() << endl;
+                               cout << i << "\t" << GeneratorName.Data() << endl;
                                for(Int_t j = 0; j<HeaderList->GetEntries();j++){
                                TString GeneratorInList = ((TObjString*)HeaderList->At(j))->GetString();
                                if(GeneratorName.CompareTo(GeneratorInList) == 0){
                                        if (GeneratorInList.CompareTo("PARAM") == 0 || GeneratorInList.CompareTo("BOX") == 0 ){
                                                if(fMCStack){
                                                        if (fMCStack->Particle(firstindexA)->GetPdgCode() == 111 || fMCStack->Particle(firstindexA)->GetPdgCode() == 221 ) {
-<<<<<<< HEAD
                                                                if (periodName.CompareTo("LHC14a1b")==0 || periodName.CompareTo("LHC14a1c")==0 ){
-=======
-                                                               if (periodName.CompareTo("LHC14a1b")==0 || periodName.CompareTo("LHC14a1b")==0 ){
->>>>>>> 014acd7... - changes for the reweighting part
                                                                        if (gh->NProduced() > 10 && (fMCStack->Particle(firstindexA+10)->GetPdgCode() == 111 || fMCStack->Particle(firstindexA+10)->GetPdgCode() == 221 )){
                                                                                fnHeaders++;
                                                                                continue;
@@ -3791,11 +3787,7 @@ void AliConversionCuts::GetNotRejectedParticles(Int_t rejection, TList *HeaderLi
                                                if ( fMCStackAOD){
                                                        AliAODMCParticle *aodMCParticle = static_cast<AliAODMCParticle*>(fMCStackAOD->At(firstindexA));
                                                        if (  aodMCParticle->GetPdgCode() == 111 || aodMCParticle->GetPdgCode() == 221 ){
-<<<<<<< HEAD
                                                                if (periodName.CompareTo("LHC14a1b")==0 || periodName.CompareTo("LHC14a1c")==0 ){
-=======
-                                                               if (periodName.CompareTo("LHC14a1b")==0 || periodName.CompareTo("LHC14a1b")==0 ){
->>>>>>> 014acd7... - changes for the reweighting part
                                                                        if (gh->NProduced() > 10 && (fMCStack->Particle(firstindexA+10)->GetPdgCode() == 111 || fMCStack->Particle(firstindexA+10)->GetPdgCode() == 221 )){
                                                                                fnHeaders++;
                                                                                continue;
@@ -3839,11 +3831,7 @@ void AliConversionCuts::GetNotRejectedParticles(Int_t rejection, TList *HeaderLi
                                        if (GeneratorInList.CompareTo("PARAM") == 0 || GeneratorInList.CompareTo("BOX") == 0 ){
                                                if(fMCStack){
                                                        if (fMCStack->Particle(firstindex)->GetPdgCode() == 111 || fMCStack->Particle(firstindex)->GetPdgCode() == 221 ) {
-<<<<<<< HEAD
                                                                if (periodName.CompareTo("LHC14a1b")==0 || periodName.CompareTo("LHC14a1c")==0 ){
-=======
-                                                               if (periodName.CompareTo("LHC14a1b")==0 || periodName.CompareTo("LHC14a1b")==0 ){
->>>>>>> 014acd7... - changes for the reweighting part
                                                                        if (gh->NProduced() > 10 && (fMCStack->Particle(firstindexA+10)->GetPdgCode() == 111 || fMCStack->Particle(firstindexA+10)->GetPdgCode() == 221 )){
                                                                                fNotRejectedStart[number] = firstindex;
                                                                                fNotRejectedEnd[number] = lastindex;
@@ -3863,11 +3851,7 @@ void AliConversionCuts::GetNotRejectedParticles(Int_t rejection, TList *HeaderLi
                                                if ( fMCStackAOD){
                                                        AliAODMCParticle *aodMCParticle = static_cast<AliAODMCParticle*>(fMCStackAOD->At(firstindex));
                                                        if (  aodMCParticle->GetPdgCode() == 111 || aodMCParticle->GetPdgCode() == 221 ){
-<<<<<<< HEAD
                                                                if (periodName.CompareTo("LHC14a1b")==0 || periodName.CompareTo("LHC14a1c")==0 ){
-=======
-                                                               if (periodName.CompareTo("LHC14a1b")==0 || periodName.CompareTo("LHC14a1b")==0 ){
->>>>>>> 014acd7... - changes for the reweighting part
                                                                        if (gh->NProduced() > 10 && (fMCStack->Particle(firstindexA+10)->GetPdgCode() == 111 || fMCStack->Particle(firstindexA+10)->GetPdgCode() == 221 )){
                                                                                fNotRejectedStart[number] = firstindex;
                                                                                fNotRejectedEnd[number] = lastindex;