/[PAMELA software]/PamelaLevel2/src/PamLevel2.cpp

Diff of /PamelaLevel2/src/PamLevel2.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 1.94 by mocchiut,
Wed Mar 12 16:37:29 2014 UTC
+revision 1.98 by mocchiut,
Fri Oct 17 14:03:46 2014 UTC
 Line 278 
 ClassImp( GPamela);
   */
  PamTrack::PamTrack() {
    trk_track = 0;
+   trk_ext_track = 0;
    calo_track = 0;
    tof_track = 0;
    orb_track = 0;
-Line 295 
 PamTrack::PamTrack() {
+Line 296 
 PamTrack::PamTrack() {
   */
  PamTrack::PamTrack(TrkTrack* t, CaloTrkVar* c, ToFTrkVar* o, OrbitalInfoTrkVar *r) {
+   trk_ext_track = 0;
    trk_track = 0;
    calo_track = 0;
    tof_track = 0;
-Line 302 
 PamTrack::PamTrack(TrkTrack* t, CaloTrkV
+Line 304 
 PamTrack::PamTrack(TrkTrack* t, CaloTrkV
    //     if(t)trk_track  = new TrkTrack(*t);
    //     if(c)calo_track = new CaloTrkVar(*c);
    //     if(o)tof_track  = new ToFTrkVar(*o);
-   if (t)
+ //   if (t)
-     trk_track = t;
+ //     trk_track = t;
+ //   if (c)
+ //     calo_track = c;
+ //   if (o)
+ //     tof_track = o;
+ //   if (r)
+ //     orb_track = r;
+ //   candeleteobj = 0;
+   if (t){
+       trk_track = new TrkTrack(*t);
+       trk_ext_track = new ExtTrack(*t);//NB!! ha dimensione 6 invece che 8
+   }
    if (c)
-     calo_track = c;
+     calo_track = new CaloTrkVar(*c);
    if (o)
-     tof_track = o;
+     tof_track = new ToFTrkVar(*o);
    if (r)
-     orb_track = r;
+     orb_track = new OrbitalInfoTrkVar(*r);
+   candeleteobj = 1;
-   candeleteobj = 0;
+ }
+ ;
+ /**
+  * Constructor
+  */
+ PamTrack::PamTrack(ExtTrack* t, CaloTrkVar* c, ToFTrkVar* o, OrbitalInfoTrkVar *r) {
+   trk_ext_track = 0;
+   trk_track = 0;
+   calo_track = 0;
+   tof_track = 0;
+   orb_track = 0;
+   //     if(t)trk_track  = new TrkTrack(*t);
+   //     if(c)calo_track = new CaloTrkVar(*c);
+   //     if(o)tof_track  = new ToFTrkVar(*o);
+ //   if (t)
+ //     trk_track = t;
+ //   if (c)
+ //     calo_track = c;
+ //   if (o)
+ //     tof_track = o;
+ //   if (r)
+ //     orb_track = r;
+ //   candeleteobj = 0;
+   if (t){
+ ////      trk_track = new TrkTrack(*t);//in this case TrkTrack object remains null
+       trk_ext_track = new ExtTrack(*t);
+   }
+   if (c)
+     calo_track = new CaloTrkVar(*c);
+   if (o)
+     tof_track = new ToFTrkVar(*o);
+   if (r)
+     orb_track = new OrbitalInfoTrkVar(*r);
+   candeleteobj = 1;
+   pscore = 0;
+   iscore = 0;
  }
  ;
  PamTrack::PamTrack(const PamTrack& track) {
    TrkTrack *t = track.trk_track;
+   ExtTrack *e = track.trk_ext_track;
    CaloTrkVar *c = track.calo_track;
    ToFTrkVar *o = track.tof_track;
    OrbitalInfoTrkVar *r = track.orb_track;
-   trk_track = 0;
+   trk_ext_track = 0;
-   calo_track = 0;
+   trk_track     = 0;
-   tof_track = 0;
+   calo_track    = 0;
-   orb_track = 0;
+   tof_track     = 0;
+   orb_track     = 0;
+   if(e)
+       trk_ext_track = new ExtTrack(*e);
    if (t)
      trk_track = new TrkTrack(*t);
    if (c)
-Line 334 
 PamTrack::PamTrack(const PamTrack& track
+Line 394 
 PamTrack::PamTrack(const PamTrack& track
      tof_track = new ToFTrkVar(*o);
    if (r)
      orb_track = new OrbitalInfoTrkVar(*r);
    candeleteobj = 1;
+   pscore = 0;
+   iscore = 0;
  }
- void PamTrack::Clear() {
+ void PamTrack::Clear(Option_t *option) {
-   //    cout << "PamTrack::Clear() "<<candeleteobj<<endl;
+ //    cout << "PamTrack::Clear( "<<option<<" ) "<<candeleteobj<<endl;
    if (candeleteobj) {
+     if (trk_ext_track)
+       trk_ext_track->ExtTrack::Clear(option);
      if (trk_track)
        trk_track->TrkTrack::Clear();
      if (calo_track)
-Line 351 
 void PamTrack::Clear() {
+Line 417 
 void PamTrack::Clear() {
        orb_track->OrbitalInfoTrkVar::Clear();//???
    }
    else {
+     trk_ext_track = 0;
      trk_track = 0;
      calo_track = 0;
      tof_track = 0;
-Line 363 
 void PamTrack::Clear() {
+Line 430 
 void PamTrack::Clear() {
  void PamTrack::Delete() {
    //    cout << "PamTrack::Delete() "<<candeleteobj<<endl;
    if (candeleteobj) {
+     if (trk_ext_track) {
+       trk_ext_track->ExtTrack::Clear("C");
+       delete trk_ext_track;
+     }
      if (trk_track) {
        trk_track->TrkTrack::Clear();
        delete trk_track;
-Line 384 
 void PamTrack::Delete() {
+Line 455 
 void PamTrack::Delete() {
      Clear();
    }
  }
  //--------------------------------------
  //
  //
-Line 417 
 PamLevel2::PamLevel2(TString ddir, TStri
+Line 492 
 PamLevel2::PamLevel2(TString ddir, TStri
      GetPamTree(listf, detlist);
    if (listf)
      GetRunTree(listf);
-   this->SetMaxShift(-1);
+   SetMaxShift(-1);
  }
-Line 425 
 PamLevel2::PamLevel2(TString ddir, TList
+Line 500 
 PamLevel2::PamLevel2(TString ddir, TList
    Initialize();
    GetPamTree(llist, detlist);
    GetRunTree(llist);
-   this->SetMaxShift(-1);
+   SetMaxShift(-1);
  }
  /**
-Line 437 
 PamLevel2::PamLevel2(TString ddir, TList
+Line 512 
 PamLevel2::PamLevel2(TString ddir, TList
   */
  PamLevel2::PamLevel2(TString ddir, TString llist) {
    Initialize();
    TList* listf = GetListOfLevel2Files(ddir, llist);
+   cout << "GetPamTree: "<<endl;
    GetPamTree(listf, "");
+   cout << "GetRunTree: "<<endl;
    GetRunTree(listf);
-   this->SetMaxShift(-1);
+   SetMaxShift(-1);
  }
-Line 455 
 void PamLevel2::Initialize() {
+Line 532 
 void PamLevel2::Initialize() {
    trkh_obj = 0;
    calo1_obj = 0;
    calo2_obj = 0;
-   tof_obj = 0;
+   tof2_obj = 0;
    trig_obj = 0;
    s4_obj = 0;
    nd_obj = 0;
    ac_obj = 0;
-   orb_obj = 0;
+   orb2_obj = 0;
    gp_obj = 0;
+   extAlgFlag=0;
+   trk_ext_obj     = 0;
+   trk_ext_nuc_obj = 0;
+   trk_nuc_obj     = 0;
+   calo_ext_obj     = 0;
+   calo_ext_nuc_obj = 0;
+   calo_nuc_obj     = 0;
+   tof_ext_obj     = 0;
+   tof_ext_nuc_obj = 0;
+   tof_nuc_obj     = 0;
+   orb_ext_obj     = 0;
+   orb_ext_nuc_obj = 0;
+   orb_nuc_obj     = 0;
+   trk2_nuc_obj  = 0;
+   calo2_nuc_obj = 0;
+   tof2_nuc_obj  = 0;
+   orb2_nuc_obj  = 0;
    run_obj = 0;//new GL_RUN();
    soft_obj = 0;// Emiliano
    irun = -1LL;
-Line 475 
 void PamLevel2::Initialize() {
+Line 576 
 void PamLevel2::Initialize() {
    gltsync = 0; // Emiliano
    fUpdateRunInfo = true; // Emiliano
    fUseDBinRunInfo = true; // Emiliano
+   fDiscarded = false; //EM
    isSync = false; // by default assume that the level2 file(s) is(are) not sinchronized between L0/DB and L2, that is we miss some packets in L2 due to nested/DV-skipped events
    il0entry = 0LL;
    //  hasL0EE = true;
-Line 539 
 void PamLevel2::Initialize() {
+Line 641 
 void PamLevel2::Initialize() {
    ORB = true;
    GP = false;
+   EXT = false;
+   NUC = false;
+   trkAlg = "STD";//default tracking algorythm
    RUN = true;
    SELLI = -1;
-Line 549 
 void PamLevel2::Initialize() {
+Line 655 
 void PamLevel2::Initialize() {
    tsorted = 0;
    timage = 0;
+   text = 0 ;
+   tsorted_nuc = 0;
+   timage_nuc = 0;
+   text_nuc = 0 ;
    howtosort = "+CAL+TOF";
    //howtosort = "+TOF";
-Line 556 
 void PamLevel2::Initialize() {
+Line 667 
 void PamLevel2::Initialize() {
    issorted = false;
    lastsorted = -1;
+   issorted_new = false;
+   lastsorted_new = -1;
  }
  ;
-Line 586 
 void PamLevel2::Delete() {
+Line 699 
 void PamLevel2::Delete() {
      delete calo1_obj;
    if (calo2_obj)
      delete calo2_obj;
-   if (tof_obj)
+   if (tof2_obj)
-     delete tof_obj;
+     delete tof2_obj;
    if (trig_obj)
      delete trig_obj;
    if (s4_obj)
-Line 596 
 void PamLevel2::Delete() {
+Line 709 
 void PamLevel2::Delete() {
      delete nd_obj;
    if (ac_obj)
      delete ac_obj;
-   if (orb_obj)
+   if (orb2_obj)
-     delete orb_obj;
+     delete orb2_obj;
    if (gp_obj)
      delete gp_obj;
+   if(trk_nuc_obj)trk_nuc_obj->Delete();
+   if(trk_ext_obj)trk_ext_obj->Delete();
+   if(trk_ext_nuc_obj)trk_ext_nuc_obj->Delete();
+   if(calo_nuc_obj)calo_nuc_obj->Delete();
+   if(calo_ext_obj)calo_ext_obj->Delete();
+   if(calo_ext_nuc_obj)calo_ext_nuc_obj->Delete();
+   if(tof_nuc_obj)tof_nuc_obj->Delete();
+   if(tof_ext_obj)tof_ext_obj->Delete();
+   if(tof_ext_nuc_obj)tof_ext_nuc_obj->Delete();
+   if(orb_nuc_obj)orb_nuc_obj->Delete();
+   if(orb_ext_obj)orb_ext_obj->Delete();
+   if(orb_ext_nuc_obj)orb_ext_nuc_obj->Delete();
+   if(trk2_nuc_obj)trk2_nuc_obj->Delete();;
+   if( calo2_nuc_obj)calo2_nuc_obj->Delete();;
+   if(tof2_nuc_obj)tof2_nuc_obj->Delete();;
+   if(orb2_nuc_obj)orb2_nuc_obj->Delete();;
    if (tsorted) {
      tsorted->Delete();
      delete tsorted;
-Line 609 
 void PamLevel2::Delete() {
+Line 746 
 void PamLevel2::Delete() {
      timage->Delete();
      delete timage;
    }
+   if (text) {
+     text->Delete();
+     delete text;
+   }
+   if (tsorted_nuc) {
+     tsorted_nuc->Delete();
+     delete tsorted_nuc;
+   }
+   if (timage_nuc) {
+     timage_nuc->Delete();
+     delete timage_nuc;
+   }
+   if (text_nuc) {
+     text_nuc->Delete();
+     delete text_nuc;
+   }
    if (dbc) {
      dbc->Close();
-Line 676 
 void PamLevel2::Delete() {
+Line 831 
 void PamLevel2::Delete() {
    if (irunoffset)
      delete[] irunoffset;
+   Initialize();
  }
  ;
-Line 709 
 void PamLevel2::Clear() {
+Line 867 
 void PamLevel2::Clear() {
      calo1_obj->Clear();
    if (calo2_obj)
      calo2_obj->Clear();
-   if (tof_obj)
+   if (tof2_obj)
-     tof_obj->Clear();
+     tof2_obj->Clear();
    if (trig_obj)
      trig_obj->Clear();
    if (s4_obj)
-Line 719 
 void PamLevel2::Clear() {
+Line 877 
 void PamLevel2::Clear() {
      nd_obj->Clear();
    if (ac_obj)
      ac_obj->Clear();
-   if (orb_obj)
+   if (orb2_obj)
-     orb_obj->Clear();
+     orb2_obj->Clear();
    if (gp_obj)
      gp_obj->Clear();
    //    if(sorted_tracks)sorted_tracks->Clear();
    //    sorted_tracks.Clear();
-   if (tsorted) {
+   if(trk_nuc_obj)trk_nuc_obj->Clear();
-     tsorted->Delete();
+   if(trk_ext_obj)trk_ext_obj->Clear();
-   }
+   if(trk_ext_nuc_obj)trk_ext_nuc_obj->Clear();
-   if (timage) {
-     timage->Delete();
+   if(calo_nuc_obj)calo_nuc_obj->Clear();
-   }
+   if(calo_ext_obj)calo_ext_obj->Clear();
+   if(calo_ext_nuc_obj)calo_ext_nuc_obj->Clear();
+   if(tof_nuc_obj)tof_nuc_obj->Clear();
+   if(tof_ext_obj)tof_ext_obj->Clear();
+   if(tof_ext_nuc_obj)tof_ext_nuc_obj->Clear();
+   if(orb_nuc_obj)orb_nuc_obj->Clear();
+   if(orb_ext_obj)orb_ext_obj->Clear();
+   if(orb_ext_nuc_obj)orb_ext_nuc_obj->Clear();
+   if(trk2_nuc_obj)trk2_nuc_obj->Clear();;
+   if( calo2_nuc_obj)calo2_nuc_obj->Clear();;
+   if(tof2_nuc_obj)tof2_nuc_obj->Clear();;
+   if(orb2_nuc_obj)orb2_nuc_obj->Clear();;
+   if (tsorted)tsorted->Delete();
+   if (timage)timage->Delete();
+   if (text) text->Delete();
+   if (tsorted_nuc)tsorted_nuc->Delete();
+   if (timage_nuc)timage_nuc->Delete();
+   if (text_nuc) text_nuc->Delete();
  }
  ;
-Line 797 
 void PamLevel2::Reset() {
+Line 977 
 void PamLevel2::Reset() {
    trkh_obj = 0;
    calo1_obj = 0;
    calo2_obj = 0;
-   tof_obj = 0;
+   tof2_obj = 0;
    trig_obj = 0;
    s4_obj = 0;
    nd_obj = 0;
    ac_obj = 0;
-   orb_obj = 0;
+   orb2_obj = 0;
    gp_obj = 0;
+   trk_ext_obj     = 0;
+   trk_ext_nuc_obj = 0;
+   trk_nuc_obj     = 0;
+   calo_ext_obj     = 0;
+   calo_ext_nuc_obj = 0;
+   calo_nuc_obj     = 0;
+   tof_ext_obj     = 0;
+   tof_ext_nuc_obj = 0;
+   tof_nuc_obj     = 0;
+   orb_ext_obj     = 0;
+   orb_ext_nuc_obj = 0;
+   orb_nuc_obj     = 0;
+   trk2_nuc_obj  = 0;
+   calo2_nuc_obj = 0;
+   tof2_nuc_obj  = 0;
+   orb2_nuc_obj  = 0;
+   trk2_nuc_obj  = 0;
+   calo2_nuc_obj = 0;
+   tof2_nuc_obj  = 0;
+   orb2_nuc_obj  = 0;
    //
    // Reset run pointers
    //
-Line 838 
 Bool_t PamLevel2::IsGood(Bool_t strict)
+Line 1044 
 Bool_t PamLevel2::IsGood(Bool_t strict)
    if (strict) {
      if (trk2_obj && trk2_obj->UnpackError() != 0)
        goodev = false;
-     if (tof_obj && tof_obj->unpackError != 0)
+     if (tof2_obj && tof2_obj->unpackError != 0)
        goodev = false;
      if (trig_obj && trig_obj->unpackError != 0)
        goodev = false;
-Line 848 
 Bool_t PamLevel2::IsGood(Bool_t strict)
+Line 1054 
 Bool_t PamLevel2::IsGood(Bool_t strict)
        goodev = false;
      if (ac_obj && (ac_obj->unpackError != 0 || ((ac_obj->status[0] >> 2) & 1) || ((ac_obj->status[1] >> 2) & 1)))
        goodev = false;
-     //  if(orb_obj)
+     //  if(orb2_obj)
    }
    else {
      if (nd_obj && nd_obj->unpackError != 0)
-Line 879 
 void PamLevel2::SetMaxShift(Int_t sh){
+Line 1085 
 void PamLevel2::SetMaxShift(Int_t sh){
      printf("PamLevel2::SetMaxShift(Int_t) --WARNING-- the default is optimized by checking the level2 file\n it is strongly suggested to let PamLevel2 choose the max shift!\n");
      maxshift = sh;
    } else {
-     ULong64_t nev = this->GetEntries();
+     ULong64_t nev = GetEntries();
      ULong64_t runnev = 0ULL;
      for (Int_t r=0; r< run_tree->GetEntries();r++){
        run_tree->GetEntry(r);//update runinfo
-Line 934 
 void *PamLevel2::GetPointerTo(const char
+Line 1140 
 void *PamLevel2::GetPointerTo(const char
      return &calo2_obj;
    };
    if (!objname.CompareTo("ToFLevel2")) {
-     if (!tof_obj) {
+     if (!tof2_obj) {
-       tof_obj = new ToFLevel2();
+       tof2_obj = new ToFLevel2();
-       tof_obj->Set();
+       tof2_obj->Set();
      }
-     return &tof_obj;
+     return &tof2_obj;
    };
    if (!objname.CompareTo("TrigLevel2")) {
      if (!trig_obj)
-Line 961 
 void *PamLevel2::GetPointerTo(const char
+Line 1167 
 void *PamLevel2::GetPointerTo(const char
      return &ac_obj;
    };
    if (!objname.CompareTo("OrbitalInfo")) {
-     if (!orb_obj) {
+     if (!orb2_obj) {
-       orb_obj = new OrbitalInfo();
+       orb2_obj = new OrbitalInfo();
-       orb_obj->Set();
+       orb2_obj->Set();
      }
-     return &orb_obj;
+     return &orb2_obj;
    };
    //     if(!objname.CompareTo("OrbitalInfo")){
-   //    if(!orb_obj)   orb_obj   = new OrbitalInfo();
+   //    if(!orb2_obj)   orb2_obj   = new OrbitalInfo();
-   //    return &orb_obj;
+   //    return &orb2_obj;
    //     };
    if (!objname.CompareTo("GPamela")) {
      if (!gp_obj)
-Line 1033 
 CaloTrkVar *PamLevel2::GetCaloStoredTrac
+Line 1239 
 CaloTrkVar *PamLevel2::GetCaloStoredTrac
   */
  ToFTrkVar *PamLevel2::GetToFStoredTrack(int seqno) {
-   if (!tof_obj)
+   if (!tof2_obj)
      return 0;
-   if (tof_obj->ToFLevel2::ntrk() == 0) {
+   if (tof2_obj->ToFLevel2::ntrk() == 0) {
      cout << "PamLevel2::GetToFStoredTrack(int) : requested tracker SeqNo " << seqno << " but no ToF tracks are stored"
          << endl;
      return NULL;
-Line 1046 
 ToFTrkVar *PamLevel2::GetToFStoredTrack(
+Line 1252 
 ToFTrkVar *PamLevel2::GetToFStoredTrack(
    Int_t it_tof = 0;
    do {
-     c = tof_obj->ToFLevel2::GetToFTrkVar(it_tof);
+     c = tof2_obj->ToFLevel2::GetToFTrkVar(it_tof);
      it_tof++;
-   } while (c && seqno != c->trkseqno && it_tof < tof_obj->ToFLevel2::ntrk());
+   } while (c && seqno != c->trkseqno && it_tof < tof2_obj->ToFLevel2::ntrk());
    if (!c || seqno != c->trkseqno) {
      c = 0;
-Line 1071 
 ToFTrkVar *PamLevel2::GetToFStoredTrack(
+Line 1277 
 ToFTrkVar *PamLevel2::GetToFStoredTrack(
   */
  OrbitalInfoTrkVar *PamLevel2::GetOrbitalInfoStoredTrack(int seqno) {
-   if (!orb_obj)
+   if (!orb2_obj)
      return 0;
-   if (orb_obj->OrbitalInfo::ntrk() == 0) {
+   if (orb2_obj->OrbitalInfo::ntrk() == 0) {
      //       // TRICK BEGIN
      //       OrbitalInfoTrkVar  *r = new OrbitalInfoTrkVar(); // TEMPORARY TRICK
      //       Int_t nn = 0;
-     //       TClonesArray &tor = *orb_obj->OrbitalInfoTrk;
+     //       TClonesArray &tor = *orb2_obj->OrbitalInfoTrk;
-     //       for(Int_t nt=0; nt < tof_obj->ToFLevel2::ntrk(); nt++){
+     //       for(Int_t nt=0; nt < tof2_obj->ToFLevel2::ntrk(); nt++){
      //  //
-     //  ToFTrkVar *ptt = tof_obj->ToFLevel2::GetToFTrkVar(nt);
+     //  ToFTrkVar *ptt = tof2_obj->ToFLevel2::GetToFTrkVar(nt);
      //  if ( ptt->trkseqno != -1  ){
      //    //
      //    r->trkseqno = ptt->trkseqno;
-Line 1103 
 OrbitalInfoTrkVar *PamLevel2::GetOrbital
+Line 1309 
 OrbitalInfoTrkVar *PamLevel2::GetOrbital
      //       };
      //       delete r;
      //       OrbitalInfoTrkVar *c = 0;
-     //       c = orb_obj->OrbitalInfo::GetOrbitalInfoTrkVar(0);
+     //       c = orb2_obj->OrbitalInfo::GetOrbitalInfoTrkVar(0);
      //       return c;
      //       //TRICK END
      cout << "PamLevel2::GetOrbitalInfoStoredTrack(int) : requested tracker SeqNo " << seqno
-Line 1115 
 OrbitalInfoTrkVar *PamLevel2::GetOrbital
+Line 1321 
 OrbitalInfoTrkVar *PamLevel2::GetOrbital
    Int_t it_tof = 0;
    do {
-     c = orb_obj->OrbitalInfo::GetOrbitalInfoTrkVar(it_tof);
+     c = orb2_obj->OrbitalInfo::GetOrbitalInfoTrkVar(it_tof);
      it_tof++;
-   } while (c && seqno != c->trkseqno && it_tof < orb_obj->OrbitalInfo::ntrk());
+   } while (c && seqno != c->trkseqno && it_tof < orb2_obj->OrbitalInfo::ntrk());
    if (!c || seqno != c->trkseqno) {
      c = 0;
-Line 1248 
 void PamLevel2::SortTracks() {
+Line 1454 
 void PamLevel2::SortTracks() {
    // create TCloneArrays to store tracks and its images
    if (!tsorted)
      tsorted = new TClonesArray("PamTrack", trk2_obj->GetNTracks());
-   tsorted->Delete();
+   tsorted->Clear("C+C");//Delete();
    TClonesArray &ttsorted = *tsorted;
    if (!timage)
      timage = new TClonesArray("PamTrack", trk2_obj->GetNTracks());
-   timage->Delete();
+   timage->Clear("C+C");//Delete();
    TClonesArray &ttimage = *timage;
    //--------------------------------------------------
    // retrieve sorting method
    //--------------------------------------------------
-Line 1371 
 void PamLevel2::SortTracks() {
+Line 1579 
 void PamLevel2::SortTracks() {
        // -----------------------------------------------------------------------------------------
        // check the number of hit pmts along the track
        // on S12 S21 and S32, where paddles are parallel to Y axis
-       if ((use_TOF || use_S1 || use_S2 || use_S3) && !tof_obj) {
+       if ((use_TOF || use_S1 || use_S2 || use_S3) && !tof2_obj) {
          cout << "void PamLevel2::SortTracks(): howtosort= " << how << " but ToFLevel2 not loaded !!!";
          return;
        };
-Line 1388 
 void PamLevel2::SortTracks() {
+Line 1596 
 void PamLevel2::SortTracks() {
          //
          Float_t sen = 0.;
          for (Int_t ih = 0; ih < op->npmtadc; ih++) {
-           Int_t pl = tof_obj->GetPlaneIndex((op->pmtadc).At(ih));
+           Int_t pl = tof2_obj->GetPlaneIndex((op->pmtadc).At(ih));
            if (pl == 2 || pl == 3 || pl == 4 || pl == 5)
              sen += (op->dedx).At(ih);
          };
          for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
-           Int_t pl = tof_obj->GetPlaneIndex((oi->pmtadc).At(ih));
+           Int_t pl = tof2_obj->GetPlaneIndex((oi->pmtadc).At(ih));
            if (pl == 2 || pl == 3 || pl == 4 || pl == 5)
              sen += (oi->dedx).At(ih);
          };
-Line 1406 
 void PamLevel2::SortTracks() {
+Line 1614 
 void PamLevel2::SortTracks() {
            Int_t nz = 6;
            Float_t zin[6]; // << define TOF z-coordinates
            for (Int_t ip = 0; ip < nz; ip++)
-             zin[ip] = tof_obj->ToFLevel2::GetZTOF(tof_obj->ToFLevel2::GetToFPlaneID(ip)); // << read ToF plane z-coordinates
+             zin[ip] = tof2_obj->ToFLevel2::GetZTOF(tof2_obj->ToFLevel2::GetToFPlaneID(ip)); // << read ToF plane z-coordinates
            Trajectory *tr = new Trajectory(nz, zin);
            //
            Int_t nphit_p = 0;
-Line 1415 
 void PamLevel2::SortTracks() {
+Line 1623 
 void PamLevel2::SortTracks() {
            Float_t enhit_i = 0.;
            //
            for (Int_t ih = 0; ih < op->npmtadc; ih++) {
-             Int_t pl = tof_obj->GetPlaneIndex((op->pmtadc).At(ih));
+             Int_t pl = tof2_obj->GetPlaneIndex((op->pmtadc).At(ih));
              if (pl == 1 || pl == 2 || pl == 5) {
                nphit_p++;
                enhit_p += (op->dedx).At(ih);
-Line 1426 
 void PamLevel2::SortTracks() {
+Line 1634 
 void PamLevel2::SortTracks() {
            //
            if (fabs(tr->y[0] - oi->ytofpos[0]) < 2.) {
              for (Int_t ih = 0; ih < op->npmtadc; ih++) {
-               Int_t pl = tof_obj->GetPlaneIndex((op->pmtadc).At(ih));
+               Int_t pl = tof2_obj->GetPlaneIndex((op->pmtadc).At(ih));
                if (pl == 0) {
                  nphit_p++;
                  enhit_p += (op->dedx).At(ih);
-Line 1435 
 void PamLevel2::SortTracks() {
+Line 1643 
 void PamLevel2::SortTracks() {
            };
            if (fabs(tr->y[3] - oi->ytofpos[1]) < 2.) {
              for (Int_t ih = 0; ih < op->npmtadc; ih++) {
-               Int_t pl = tof_obj->GetPlaneIndex((op->pmtadc).At(ih));
+               Int_t pl = tof2_obj->GetPlaneIndex((op->pmtadc).At(ih));
                if (pl == 3) {
                  nphit_p++;
                  enhit_p += (op->dedx).At(ih);
-Line 1444 
 void PamLevel2::SortTracks() {
+Line 1652 
 void PamLevel2::SortTracks() {
            };
            if (fabs(tr->y[4] - oi->ytofpos[2]) < 2.) {
              for (Int_t ih = 0; ih < op->npmtadc; ih++) {
-               Int_t pl = tof_obj->GetPlaneIndex((op->pmtadc).At(ih));
+               Int_t pl = tof2_obj->GetPlaneIndex((op->pmtadc).At(ih));
                if (pl == 4) {
                  nphit_p++;
                  enhit_p += (op->dedx).At(ih);
-Line 1453 
 void PamLevel2::SortTracks() {
+Line 1661 
 void PamLevel2::SortTracks() {
            };
            for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
-             Int_t pl = tof_obj->GetPlaneIndex((oi->pmtadc).At(ih));
+             Int_t pl = tof2_obj->GetPlaneIndex((oi->pmtadc).At(ih));
              if (pl == 1 || pl == 2 || pl == 5) {
                nphit_i++;
                enhit_i += (op->dedx).At(ih);
-Line 1464 
 void PamLevel2::SortTracks() {
+Line 1672 
 void PamLevel2::SortTracks() {
            //
            if (fabs(tr->y[0] - oi->ytofpos[0]) < 2.) {
              for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
-               Int_t pl = tof_obj->GetPlaneIndex((oi->pmtadc).At(ih));
+               Int_t pl = tof2_obj->GetPlaneIndex((oi->pmtadc).At(ih));
                if (pl == 0) {
                  nphit_i++;
                  enhit_i += (op->dedx).At(ih);
-Line 1473 
 void PamLevel2::SortTracks() {
+Line 1681 
 void PamLevel2::SortTracks() {
            };
            if (fabs(tr->y[3] - oi->ytofpos[1]) < 2.) {
              for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
-               Int_t pl = tof_obj->GetPlaneIndex((oi->pmtadc).At(ih));
+               Int_t pl = tof2_obj->GetPlaneIndex((oi->pmtadc).At(ih));
                if (pl == 3) {
                  nphit_i++;
                  enhit_i += (op->dedx).At(ih);
-Line 1482 
 void PamLevel2::SortTracks() {
+Line 1690 
 void PamLevel2::SortTracks() {
            };
            if (fabs(tr->y[4] - oi->ytofpos[2]) < 2.) {
              for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
-               Int_t pl = tof_obj->GetPlaneIndex((oi->pmtadc).At(ih));
+               Int_t pl = tof2_obj->GetPlaneIndex((oi->pmtadc).At(ih));
                if (pl == 4) {
                  nphit_i++;
                  enhit_i += (op->dedx).At(ih);
-Line 1526 
 void PamLevel2::SortTracks() {
+Line 1734 
 void PamLevel2::SortTracks() {
             cout << "image: npmttdc "<< oi->npmttdc << endl;*/
            //      for (Int_t ih=0; ih < op->npmtadc; ih++){
-           //        Int_t pl = tof_obj->GetPlaneIndex( (op->pmtadc).At(ih) );
+           //        Int_t pl = tof2_obj->GetPlaneIndex( (op->pmtadc).At(ih) );
            //        if(pl == 1 || pl == 2 || pl == 5)nphit_p++;
            //      };
            //      for (Int_t ih=0; ih < oi->npmtadc; ih++){
-           //        Int_t pl = tof_obj->GetPlaneIndex( (oi->pmtadc).At(ih) );
+           //        Int_t pl = tof2_obj->GetPlaneIndex( (oi->pmtadc).At(ih) );
            //        if(pl == 1 || pl == 2 || pl == 5)nphit_i++;
            //      };
            // --- modified to count tdc signals (more efficient?)
            // --- and to implement check on tdcflag
            for (Int_t ih = 0; ih < op->npmttdc; ih++) {
-             Int_t pl = tof_obj->GetPlaneIndex((op->pmttdc).At(ih));
+             Int_t pl = tof2_obj->GetPlaneIndex((op->pmttdc).At(ih));
              //      if( (op->tdcflag).At(ih)==0 && (pl == 1 || pl == 2 || pl == 5) )nphit_p++;
              if ((use_S1 && (pl == 0 || pl == 1)) || (use_S2 && (pl == 2 || pl == 3))
                  || (use_S3 && (pl == 4 || pl == 5))) {
-Line 1547 
 void PamLevel2::SortTracks() {
+Line 1755 
 void PamLevel2::SortTracks() {
            };
            for (Int_t ih = 0; ih < oi->npmttdc; ih++) {
-             Int_t pl = tof_obj->GetPlaneIndex((oi->pmttdc).At(ih));
+             Int_t pl = tof2_obj->GetPlaneIndex((oi->pmttdc).At(ih));
              //      if( (oi->tdcflag).At(ih)==0 && (pl == 1 || pl == 2 || pl == 5) )nphit_i++;
              if ((use_S1 && (pl == 0 || pl == 1)) || (use_S2 && (pl == 2 || pl == 3))
                  || (use_S3 && (pl == 4 || pl == 5))) {
-Line 1722 
 void PamLevel2::SortTracks() {
+Line 1930 
 void PamLevel2::SortTracks() {
  }
  ;
+ //
+ //--------------------------------------
+ /**
+  * Sort physical (tracker) tracks.
+  * @param how String to set the sorting cryterium (es: "CAL" or "TRK+CAL+TOF" ecc...).
+  * Sorting cryteria:
+  * TRK: lower chi**2
+  * CAL: lower Y spatial residual on the first calorimeter plane
+  * TOF: bigger numebr of hit PMTs along the track, on S12 S21 S32 (where paddles are along the Y axis).
+  * S1: (ask Emiliano)
+  * S2: (ask Emiliano)
+  * S3: (ask Emiliano)
+  * GP: more GP hits
+  * The default sorting cryterium is "TOF+CAL".
+  *
+  * The total number of physical tracks is always given by GetNTracks() and the it-th physical track can be retrieved by means of the methods GetTrack(int it) and GetTrack(int it, TString how).
+  *
+  * New version, with handling of extended tracks and nuclei tracks.
+  */
+ void PamLevel2::SortTracksNew() {
+   //--------------------------------------------------
+   //Check if the current event has already been sorted
+   //--------------------------------------------------
+   if (issorted_new && lastsorted_new == GetReadEntry()) {
+       return; //already done for this event
+   }
+ //  cout << "SORT" << endl;
+   //Reset the sort flags, just in case something will go wrong...
+   issorted_new = false;
+   lastsorted_new = -1;
+   //--------------------------------------------------
+   // set input variables
+   //--------------------------------------------------
+   TString how = howtosort;
+   //Save current Object count
+   Int_t ObjectNumber = TProcessID::GetObjectCount();
+   TrkLevel2  * trk2 ;
+   CaloLevel2 * calo2;
+   ToFLevel2  * tof2  ;
+   OrbitalInfo  * orb2 ;
+   TClonesArray * trkext ;
+   TClonesArray * caloext;
+   TClonesArray * tofext ;
+   TClonesArray * orbext ;
+ //   cout << "trk2_obj" << trk2_obj<< endl;
+ //   cout << "trk2_nuc_obj" << trk2_nuc_obj<< endl;
+ //   cout << " trk_ext_obj "<<trk_ext_obj<< endl;
+ //   cout << " trk_ext_nuc_obj "<<trk_ext_nuc_obj<< endl;
+   //-----------------------------------------------------------
+   // create/reset TCloneArrays to store tracks and their images
+   //-----------------------------------------------------------
+ //  cout << " PamLevel2::SortTracksNew() --- Clear TClonesArray objects"<<endl;
+   // main tracks from standard alg
+ //   if (!tsorted)
+ //       tsorted = new TClonesArray("PamTrack", trk2_obj->GetNTracks());
+ //   tsorted->Clear("C+C");//Delete();
+ //   // track images from standard alg
+ //   if (!timage)
+ //       timage = new TClonesArray("PamTrack", trk2_obj->GetNTracks());
+ //   timage->Clear("C+C");//Delete();
+ //   // tracks from extended algorythm
+ //   if(EXT && !text)
+ //       text = new TClonesArray("PamTrack",trk_ext_obj->GetEntries());
+ //   if(text)text->Clear("C+C");//Delete();
+   if(tsorted)delete tsorted;
+   if(timage) delete timage;
+   if(text)   delete text;
+   tsorted = new TClonesArray("PamTrack", trk2_obj->GetNTracks());
+   timage = new TClonesArray("PamTrack", trk2_obj->GetNTracks());
+   text = new TClonesArray("PamTrack",trk_ext_obj->GetEntries());
+   //-----------------------------------------------------------
+   // create/reset TCloneArrays to store tracks and their images
+   //-----------------------------------------------------------
+   if(NUC){
+       if(tsorted_nuc)delete tsorted_nuc;
+       if(timage_nuc) delete timage_nuc;
+       if(text_nuc)   delete text_nuc;
+       tsorted_nuc = new TClonesArray("PamTrack", trk2_nuc_obj->GetNTracks());
+       timage_nuc = new TClonesArray("PamTrack", trk2_nuc_obj->GetNTracks());
+       text_nuc = new TClonesArray("PamTrack",trk_ext_nuc_obj->GetEntries());
+   // main tracks from standard alg
+ //       if (!tsorted_nuc)
+ //        tsorted_nuc = new TClonesArray("PamTrack", trk2_nuc_obj->GetNTracks());
+ //       tsorted_nuc->Clear("C+C");//Delete();
+ //       // track images from standard alg
+ //       if (!timage_nuc)
+ //        timage_nuc = new TClonesArray("PamTrack", trk2_nuc_obj->GetNTracks());
+ //       timage_nuc->Clear("C+C");//Delete();
+ //       // tracks from extended algorythm
+ //       if(EXT && !text_nuc)
+ //        text_nuc = new TClonesArray("PamTrack",trk_ext_nuc_obj->GetEntries());
+ //       if(text_nuc)text_nuc->Clear("C+C");//Delete();
+   }
+   //--------------------------------------------------
+   // retrieve sorting method
+   //--------------------------------------------------
+   Bool_t use_TRK = how.Contains("TRK", TString::kIgnoreCase);
+   Bool_t use_CAL = how.Contains("CAL", TString::kIgnoreCase);
+   Bool_t use_TOF = how.Contains("TOF", TString::kIgnoreCase);
+   Bool_t use_S1 = how.Contains("S1", TString::kIgnoreCase);
+   Bool_t use_S2 = how.Contains("S2", TString::kIgnoreCase);
+   Bool_t use_S3 = how.Contains("S3", TString::kIgnoreCase);
+   Bool_t use_GP = how.Contains("GP", TString::kIgnoreCase);
+   if (use_TOF) {
+     use_S1 = true;
+     use_S2 = true;
+     use_S3 = true;
+   };
+   if (!CAL2 && use_CAL)
+     use_CAL = false;
+   if (!TOF) {
+     use_TOF = false;
+     use_S1 = false;
+     use_S2 = false;
+     use_S3 = false;
+   }
+   if (!GP) {
+     use_GP = false;
+   }
+   if (!TRK2) {
+     cout << "SortTracks() : without tracker does not work!!! (not yet)" << endl;
+     return;
+   };
+   ///////////////////////////////////////////////////////////////////////////////////
+   //
+   //   sort tracks and fill PamTrack arrays
+   //
+   ///////////////////////////////////////////////////////////////////////////////////
+   for(int doit=0; doit<2; doit++){
+ //       cout << "doit "<<doit<<endl;
+       if(doit == 0){
+           trk2  = trk2_obj;
+           calo2 = calo2_obj;
+           tof2  = tof2_obj;
+           orb2  = orb2_obj;
+           trkext = trk_ext_obj;
+           caloext = calo_ext_obj;
+           tofext = tof_ext_obj;
+           orbext = orb_ext_obj;
+       }else if (doit == 1){
+           if(!NUC)break;
+           trk2  = trk2_nuc_obj;
+           calo2 = calo2_nuc_obj;
+           tof2  = tof2_nuc_obj;
+           orb2  = orb2_nuc_obj;
+           trkext = trk_ext_nuc_obj;
+           caloext = calo_ext_nuc_obj;
+           tofext = tof_ext_nuc_obj;
+           orbext = orb_ext_nuc_obj;
+       }
+ //       cout << "trk2" << trk2<<endl;
+ //       cout << "calo2" << calo2<<endl;
+ //       cout << "tof2" << tof2<<endl;
+ //       cout << "orb2" << orb2<<endl;
+ //       cout << "trkext" <<trkext <<endl;
+ //       cout << "tofext" << tofext<<endl;
+ //       cout << "caloext" << caloext<<endl;
+ //       cout << "orbext" << orbext<<endl;
+       TClonesArray &ttext    = (doit==0 ? *text : *text_nuc);
+       TClonesArray &ttimage  = (doit==0 ? *timage : *timage_nuc);
+       TClonesArray &ttsorted = (doit==0 ? *tsorted : *tsorted_nuc);
+ //       cout << "tsorted + timage "<<doit<<endl;
+       //--------------------------------------------------
+       // loop over "physical" tracks sorted by the tracker
+       //--------------------------------------------------
+       for (Int_t i = 0; i < trk2->TrkLevel2::GetNTracks(); i++) {
+           TrkTrack *ts = 0;
+           CaloTrkVar *cs = 0;
+           ToFTrkVar *os = 0;
+           OrbitalInfoTrkVar *rs = 0;
+           // get tracker tracks
+           TrkTrack *tp = trk2->GetTrack(i); //tracker
+           CaloTrkVar *cp = calo2->GetCaloStoredTrack(tp->GetSeqNo());
+           ToFTrkVar *op = tof2->GetToFStoredTrack(tp->GetSeqNo());
+           OrbitalInfoTrkVar *rp = orb2->GetOrbitalInfoStoredTrack(tp->GetSeqNo());
+           TrkTrack *ti = 0; //tracker (image)
+           CaloTrkVar *ci = 0;
+           ToFTrkVar *oi = 0;
+           OrbitalInfoTrkVar *ri = 0;
+           //    cout << "trk track n. "<<i << " "<<hex<< tp <<dec<< endl;
+           // if track has an image, check image selection
+           Int_t tp_score = 0; //main track sorted by the tracker
+           Int_t ti_score = 0; //image track
+           Int_t totp_score = 0; //main track sorted by the tracker
+           Int_t toti_score = 0; //image track
+           if (tp->HasImage()) {
+               ti = trk2->GetTrackImage(i); //tracker (image)
+               ci = calo2->GetCaloStoredTrack(ti->GetSeqNo());
+               oi = tof2->GetToFStoredTrack(ti->GetSeqNo());
+               ri = orb2->GetOrbitalInfoStoredTrack(ti->GetSeqNo());
+               //            cout << "its image "<<i << " "<<hex<< ti <<dec<< endl;
+               //assign starting scores
+               tp_score = 0; //main track sorted by the tracker
+               ti_score = 0; //image track
+               // -----------------------------------------------------------------------------------------
+               // *****************************************************************************************
+               // -----------------------------------------------------------------------------------------
+               // calorimeter check
+               // -----------------------------------------------------------------------------------------
+               if (use_CAL && !calo2) {
+                   cout << "void PamLevel2::SortTracks(): howtosort= " << how << " but CaloLevel2 not loaded !!!";
+                   return;
+               };
+               if (use_CAL && !cp && ci) {
+                   ti_score++;
+                   toti_score++;
+               };
+               if (use_CAL && cp && !ci) {
+                   tp_score++;
+                   totp_score++;
+               };
+               if (use_CAL && cp && ci && true) {
+                   if (cp->npresh > ci->npresh && true) {
+                       tp_score++;
+                       totp_score++;
+                   };
+                   if (cp->npresh < ci->npresh && true) {
+                       ti_score++;
+                       toti_score++;
+                   };
+                   //    cout << "CALO "<<tp_score<<ti_score<<endl;
+               };
+               // -----------------------------------------------------------------------------------------
+               // *****************************************************************************************
+               // -----------------------------------------------------------------------------------------
+               // TOF check
+               // -----------------------------------------------------------------------------------------
+               // check the number of hit pmts along the track
+               // on S12 S21 and S32, where paddles are parallel to Y axis
+               if ((use_TOF || use_S1 || use_S2 || use_S3) && !tof2) {
+                   cout << "void PamLevel2::SortTracks(): howtosort= " << how << " but ToFLevel2 not loaded !!!";
+                   return;
+               };
+               //
+               if ((use_TOF || use_S1 || use_S2 || use_S3) && !op && oi) {
+                   ti_score++;
+                   toti_score++;
+               };
+               if ((use_TOF || use_S1 || use_S2 || use_S3) && op && !oi) {
+                   tp_score++;
+                   totp_score++;
+               };
+               if ((use_TOF || use_S1 || use_S2 || use_S3) && op && oi) {
+                   //
+                   Float_t sen = 0.;
+                   for (Int_t ih = 0; ih < op->npmtadc; ih++) {
+                       Int_t pl = tof2->GetPlaneIndex((op->pmtadc).At(ih));
+                       if (pl == 2 || pl == 3 || pl == 4 || pl == 5)
+                           sen += (op->dedx).At(ih);
+                   };
+                   for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
+                       Int_t pl = tof2->GetPlaneIndex((oi->pmtadc).At(ih));
+                       if (pl == 2 || pl == 3 || pl == 4 || pl == 5)
+                           sen += (oi->dedx).At(ih);
+                   };
+                   //
+                   if (sen >= sortthr && false) { // temporary disabled NUCLEI special algorithm since the new one should work for every particle (to be checked!)
+                       //printf(" IS A NUCLEUS! en = %f \n",sen);
+                       //
+                       // is a nucleus use a different algorithm
+                       //
+                       Int_t nz = 6;
+                       Float_t zin[6]; // << define TOF z-coordinates
+                       for (Int_t ip = 0; ip < nz; ip++)
+                           zin[ip] = tof2->GetZTOF(tof2->GetToFPlaneID(ip)); // << read ToF plane z-coordinates
+                       Trajectory *tr = new Trajectory(nz, zin);
+                       //
+                       Int_t nphit_p = 0;
+                       Int_t nphit_i = 0;
+                       Float_t enhit_p = 0.;
+                       Float_t enhit_i = 0.;
+                       //
+                       for (Int_t ih = 0; ih < op->npmtadc; ih++) {
+                           Int_t pl = tof2->GetPlaneIndex((op->pmtadc).At(ih));
+                           if (pl == 1 || pl == 2 || pl == 5) {
+                               nphit_p++;
+                               enhit_p += (op->dedx).At(ih);
+                           };
+                       };
+                       //
+                       tp->DoTrack2(tr);
+                       //
+                       if (fabs(tr->y[0] - oi->ytofpos[0]) < 2.) {
+                           for (Int_t ih = 0; ih < op->npmtadc; ih++) {
+                               Int_t pl = tof2->GetPlaneIndex((op->pmtadc).At(ih));
+                               if (pl == 0) {
+                                   nphit_p++;
+                                   enhit_p += (op->dedx).At(ih);
+                               };
+                           };
+                       };
+                       if (fabs(tr->y[3] - oi->ytofpos[1]) < 2.) {
+                           for (Int_t ih = 0; ih < op->npmtadc; ih++) {
+                               Int_t pl = tof2->GetPlaneIndex((op->pmtadc).At(ih));
+                               if (pl == 3) {
+                                   nphit_p++;
+                                   enhit_p += (op->dedx).At(ih);
+                               };
+                           };
+                       };
+                       if (fabs(tr->y[4] - oi->ytofpos[2]) < 2.) {
+                           for (Int_t ih = 0; ih < op->npmtadc; ih++) {
+                               Int_t pl = tof2->GetPlaneIndex((op->pmtadc).At(ih));
+                               if (pl == 4) {
+                                   nphit_p++;
+                                   enhit_p += (op->dedx).At(ih);
+                               };
+                           };
+                       };
+                       for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
+                           Int_t pl = tof2->GetPlaneIndex((oi->pmtadc).At(ih));
+                           if (pl == 1 || pl == 2 || pl == 5) {
+                               nphit_i++;
+                               enhit_i += (op->dedx).At(ih);
+                           };
+                       };
+                       //
+                       ti->DoTrack2(tr);
+                       //
+                       if (fabs(tr->y[0] - oi->ytofpos[0]) < 2.) {
+                           for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
+                               Int_t pl = tof2->GetPlaneIndex((oi->pmtadc).At(ih));
+                               if (pl == 0) {
+                                   nphit_i++;
+                                   enhit_i += (op->dedx).At(ih);
+                               };
+                           };
+                       };
+                       if (fabs(tr->y[3] - oi->ytofpos[1]) < 2.) {
+                           for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
+                               Int_t pl = tof2->GetPlaneIndex((oi->pmtadc).At(ih));
+                               if (pl == 3) {
+                                   nphit_i++;
+                                   enhit_i += (op->dedx).At(ih);
+                               };
+                           };
+                       };
+                       if (fabs(tr->y[4] - oi->ytofpos[2]) < 2.) {
+                           for (Int_t ih = 0; ih < oi->npmtadc; ih++) {
+                               Int_t pl = tof2->GetPlaneIndex((oi->pmtadc).At(ih));
+                               if (pl == 4) {
+                                   nphit_i++;
+                                   enhit_i += (op->dedx).At(ih);
+                               };
+                           };
+                       };
+                       if ((use_TOF || use_S1 || use_S2 || use_S3) && (nphit_p + nphit_i) != 0 && true) {
+                           //        printf(" seqno %i nphit_p %i nphit_i %i enhit_p %f enhit_i %f \n",trk2_obj->TrkLevel2::GetSeqNo(i),nphit_p,nphit_i,enhit_p,enhit_i);
+                           //        printf(" score p %i score i %i \n",tp_score,ti_score);
+                           //              if( enhit_p > enhit_i ) tp_score++;
+                           //              if( nphit_p >= nphit_i && enhit_p > enhit_i ) tp_score++;
+                           if (nphit_p > nphit_i)
+                               tp_score++;
+                           if (nphit_p < nphit_i)
+                               ti_score++;
+                           if (nphit_p == nphit_i) {
+                               if (enhit_p > enhit_i)
+                                   tp_score++;
+                               else
+                                   ti_score++;
+                           };
+                           //        printf(" dopo score p %i score i %i \n",tp_score,ti_score);
+                       };
+                       delete tr;
+                       //
+                   }
+                   else {
+                       // -------------
+                       // NOT a NUCLEUS
+                       // -------------
+                       //printf(" NOT a NUCLEUS! en = %f \n",sen);
+                       Int_t nphit_p = 0;
+                       Int_t nphit_i = 0;
+                       /*                                cout << "track: npmtadc "<< op->npmtadc << endl;
+                         cout << "track: npmttdc "<< op->npmttdc << endl;
+                         cout << "image: npmtadc "<< oi->npmtadc << endl;
+                         cout << "image: npmttdc "<< oi->npmttdc << endl;*/
+                       //          for (Int_t ih=0; ih < op->npmtadc; ih++){
+                       //            Int_t pl = tof2_obj->GetPlaneIndex( (op->pmtadc).At(ih) );
+                       //            if(pl == 1 || pl == 2 || pl == 5)nphit_p++;
+                       //          };
+                       //          for (Int_t ih=0; ih < oi->npmtadc; ih++){
+                       //            Int_t pl = tof2_obj->GetPlaneIndex( (oi->pmtadc).At(ih) );
+                       //            if(pl == 1 || pl == 2 || pl == 5)nphit_i++;
+                       //          };
+                       // --- modified to count tdc signals (more efficient?)
+                       // --- and to implement check on tdcflag
+                       for (Int_t ih = 0; ih < op->npmttdc; ih++) {
+                           Int_t pl = tof2->GetPlaneIndex((op->pmttdc).At(ih));
+                           //        if( (op->tdcflag).At(ih)==0 && (pl == 1 || pl == 2 || pl == 5) )nphit_p++;
+                           if ((use_S1 && (pl == 0 || pl == 1)) || (use_S2 && (pl == 2 || pl == 3))
+                               || (use_S3 && (pl == 4 || pl == 5))) {
+                               if ((op->tdcflag).At(ih) == 0)
+                                   nphit_p++;
+                           };
+                       };
+                       for (Int_t ih = 0; ih < oi->npmttdc; ih++) {
+                           Int_t pl = tof2->GetPlaneIndex((oi->pmttdc).At(ih));
+                           //        if( (oi->tdcflag).At(ih)==0 && (pl == 1 || pl == 2 || pl == 5) )nphit_i++;
+                           if ((use_S1 && (pl == 0 || pl == 1)) || (use_S2 && (pl == 2 || pl == 3))
+                               || (use_S3 && (pl == 4 || pl == 5))) {
+                               if ((oi->tdcflag).At(ih) == 0)
+                                   nphit_i++;
+                           };
+                       };
+                       if ((nphit_p + nphit_i) != 0 && true) {
+                           if (nphit_p != nphit_i) {
+                               totp_score += nphit_p;
+                               toti_score += nphit_i;
+                               tp_score += nphit_p;
+                               ti_score += nphit_i;
+                           };
+                           //        if     ( nphit_p > nphit_i) tp_score+=nphit_p;
+                           //        else if( nphit_p < nphit_i) ti_score+=nphit_i;
+                           //        else ;//niente
+                       };
+                   };
+                   //    cout << "TOF "<<tp_score<<ti_score<<endl;
+               };
+               //      if(tp_score == ti_score) use_TRK = true;
+               // -----------------------------------------------------------------------------------------
+               // *****************************************************************************************
+               // -----------------------------------------------------------------------------------------
+               // tracker check
+               // -----------------------------------------------------------------------------------------
+               // chi**2 difference is not always large enough to distinguish among
+               // the real track and its image.
+               // Tracker check will be applied always when calorimeter and tof information is ambiguous.
+               // *** MODIFIED ON AUGUST 2007 ***
+               if (use_TRK) {
+                   //    if(      tp->chi2 > 0 && tp->chi2 < ti->chi2 ) tp_score++ ;
+                   //    else if( ti->chi2 > 0 && ti->chi2 < tp->chi2 ) ti_score++ ;
+                   // CHECK 1 : number of points along X
+                   if (tp->GetNX() >= ti->GetNX()) {
+                       tp_score++;
+                       totp_score++;
+                   };
+                   if (tp->GetNX() <= ti->GetNX()) {
+                       ti_score++;
+                       toti_score++;
+                   };
+                   // CHECK 2 : number of points along Y
+                   if (tp->GetNY() >= ti->GetNY()) {
+                       tp_score++;
+                       totp_score++;
+                   };
+                   if (tp->GetNY() <= ti->GetNY()) {
+                       ti_score++;
+                       toti_score++;
+                   };
+                   //    cout << "TRK "<<tp_score<<ti_score<<endl;
+               };
+               // -----------------------------------------------------------------------------------------
+               // *****************************************************************************************
+               // -----------------------------------------------------------------------------------------
+               // GPamela check
+               // -----------------------------------------------------------------------------------------
+               //---------------------------------------------------
+               // count the number of GP hits
+               //---------------------------------------------------
+               if (use_GP) {
+                   int ngphits_p = 0;
+                   int ngphits_i = 0;
+                   float toll = 0.02; //200 micron
+                   for (int ih = 0; ih < GetGPamela()->Nthspe; ih++) {
+                       int ip = (Int_t) GetGPamela()->Itrpb[ih] - 1;
+                       if (tp && tp->YGood(ip) && fabs(tp->ym[ip] - GetGPamela()->Yavspe[ih]) < toll && true)
+                           ngphits_p++;
+                       if (ti && ti->YGood(ip) && fabs(ti->ym[ip] - GetGPamela()->Yavspe[ih]) < toll && true)
+                           ngphits_i++;
+                   }
+                   if (ngphits_p > ngphits_i && true) {
+                       tp_score++;
+                       totp_score++;
+                   }
+                   if (ngphits_p < ngphits_i && true) {
+                       ti_score++;
+                       toti_score++;
+                   }
+               }
+               // *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+               // the winner is....
+               // *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+               if (tp_score > ti_score) {
+               }
+               else if (tp_score < ti_score) {
+                   ts = ti;//its image!!
+                   cs = ci;
+                   os = oi;
+                   rs = ri;
+                   Int_t totis = toti_score;
+                   ti = tp;//its image!!
+                   ci = cp;
+                   oi = op;
+                   ri = rp;
+                   tp = ts;//its image!!
+                   cp = cs;
+                   op = os;
+                   rp = rs;
+                   toti_score = totp_score;
+                   totp_score = totis;
+               }
+               else {
+                   //    cout << "Warning - track image ambiguity not solved" << endl;
+               };
+           }
+           else {
+               totp_score = 1;
+               toti_score = 0;
+               //            ts = tp;
+               //            cs = cp;
+               //            os = op;
+           };
+           //    cout <<" SortTracks() "<<i<<" -- "<<ts<<endl;
+           //    sorted_tracks->Add(ts);//save the track in the sorted array
+           //    sorted_tracks.Add(ts);//save the track in the sorted array
+           //    sorted_tracks.Add(tp);//save the track in the sorted array
+           //    cout << "SortTracks:: sorted_tracks->Add(it) "<<i<<" "<<ts<<endl;
+           //    cout<<"o "<<tp<<endl;
+           //    cout<<"o "<<cp<<endl;
+           //    cout<<"o "<<op<<endl;
+           new (ttsorted[i]) PamTrack(tp, cp, op, rp);
+           new (ttimage[i]) PamTrack(ti, ci, oi, ri);
+           ((PamTrack*) (ttsorted[i]))->SetPScore(totp_score);
+           ((PamTrack*) (ttsorted[i]))->SetIScore(toti_score);
+           ((PamTrack*) (ttimage[i]))->SetPScore(totp_score);
+           ((PamTrack*) (ttimage[i]))->SetIScore(toti_score);
+       };
+ //   if (tsorted->GetEntries() != trk2->GetNTracks()) {
+ //     cout << "void PamLevel2::SortTracks(): tsorted->GetEntries() " << tsorted->GetEntries()
+ //         << " != trk2->GetNTracks() = " << trk2->GetNTracks() << endl;
+ //     tsorted->Delete();
+ //     tsorted = 0;
+ //     timage->Delete();
+ //     timage = 0;
+ //   }
+ //       cout << "text "<<doit<<endl;
+       //--------------------------------------------------
+       // fill array with extended tracks (this is easy...)
+       //--------------------------------------------------
+       if(EXT){
+           for(int it=0; it<trkext->GetEntries(); it++){
+               new (ttext[it]) PamTrack((ExtTrack*)(*trkext)[it], (CaloTrkVar*)(*caloext)[it], (ToFTrkVar*)(*tofext)[it], (OrbitalInfoTrkVar*)(*orbext)[it]);
+           }
+       }
+   };
+   //Restore Object count
+   //To save space in the table keeping track of all referenced objects
+   //We reset the object count to what it was at the beginning of the event.
+   TProcessID::SetObjectCount(ObjectNumber);
+   //Everything went fine so the current event can be tagged as sorted
+   issorted_new = true;
+   lastsorted_new = GetReadEntry();
+ //   cout << " tsorted "<< tsorted << " "<<(tsorted ? tsorted->GetEntries() : 0)<<endl;
+ //   cout << " timage  "<< timage  << " "<<(timage  ? timage->GetEntries() : 0)<<endl;
+ //   cout << " text    "<< text    << " "<<(text    ? text->GetEntries() : 0)<<endl;
+ };
  //--------------------------------------
  //
  //
-Line 1730 
 void PamLevel2::SortTracks() {
+Line 2606 
 void PamLevel2::SortTracks() {
   * This method overrides TrkLevel2::GetTracks(), where sorting is done by decreasing number of fit points and increasing chi^2.
   * PamLevel2::GetTracks() keeps the same track order given by TrkLevel2::GetTracks(), but checks image selection by using calorimeter and ToF tracking information.
   */
  // TRefArray *PamLevel2::GetTracks(){
  // //  *-*-*-*-*-*-*-*-*-*-*-*-*
-Line 1740 
 void PamLevel2::SortTracks() {
+Line 2617 
 void PamLevel2::SortTracks() {
  //     return &sorted_tracks;
  //  };
- TClonesArray *PamLevel2::GetTracks() {
-   //  *-*-*-*-*-*-*-*-*-*-*-*-*
-   SortTracks();
-   //  *-*-*-*-*-*-*-*-*-*-*-*-*
-   return tsorted;
- }
- ;
  //--------------------------------------
  //
  //
  //--------------------------------------
  /**
   * Retrieves the it-th Pamela "physical" track.
   * It override TrkLevel2::GetTrack(int it).
   * @param it Track number, ranging from 0 to GetNTracks().
   */
- PamTrack *PamLevel2::GetTrack(int it) {
+ PamTrack *PamLevel2::GetTrackOld(int it) {
-   //    if(!trk2_obj) return 0;
-   // //  *-*-*-*+-*-*-*-*-*-*-*-*-*
+   PamTrack *track = NULL;
-   //     SortTracks("+CAL+TOF");
-   // //  *-*-*-*-*-*-*-*-*-*-*-*-*
-   // //    if(!sorted_tracks)return 0;
-   //     if(sorted_tracks.IsEmpty())return 0;
-   //     PamTrack *track = 0;
-   //     if( it >=0 && it < trk2_obj->TrkLevel2::GetNTracks() && it<sorted_tracks.GetEntriesFast() ){
-   //    TrkTrack   *t = (TrkTrack*)sorted_tracks.At(it);
-   //    track = GetPamTrackAlong(t);
-   //     }else{
-   //    cout << "PamLevel2::GetTrack(int) : tracker track SeqNo "<< it <<" does not exist (GetNTracks() = "<<trk2_obj->TrkLevel2::GetNTracks()<<")"<<endl;
-   //     };
-   //     return track;
-   //    cout << "PamLevel2::GetTrack(int it) "<<endl;
    //  *-*-*-*-*-*-*-*-*-*-*-*-*
    SortTracks();
    //  *-*-*-*-*-*-*-*-*-*-*-*-*
    if (!tsorted)
-     return 0;
+     return track;
    if (!tsorted->GetEntries())
-     return 0;
+     return track;
-   PamTrack *track = 0;
    if (it >= 0 && it < trk2_obj->TrkLevel2::GetNTracks()) {
-     //  TrkTrack   *t = (TrkTrack*)sorted_tracks.At(it);
-     //  track = GetPamTrackAlong(t);
-     //TClonesArray &t = *(tsorted);
-     //track = (PamTrack*)t[it];
      track = (PamTrack*)((*tsorted)[it]);
    }
    else {
-     cout << "PamLevel2::GetTrack(int) : tracker track SeqNo " << it << " does not exist (GetNTracks() = "
+     cout << "PamLevel2::GetTrackOld(int) : tracker track SeqNo " << it << " does not exist (GetNTracks() = "
          << trk2_obj->TrkLevel2::GetNTracks() << ")" << endl;
    };
    return track;
+ };
+ //PamTrack *PamLevel2::GetTrack(int it) { return GetTrack(it,trkAlg); };
+ /**
+  * Retrieves the it-th Pamela "physical" track.
+  * It override TrkLevel2::GetTrack(int it).
+  * @param it Track number, ranging from 0 to GetNTracks().
+  * @param alg Algorythm, see SetTrakingAlgorythm(char *alg) for explanation.
+  */
+ PamTrack *PamLevel2::GetTrack(int it, const char* alg) {
+     TString s(alg);
+     if(!s.CompareTo("") ||!s.CompareTo("STD") )return GetTrackOld(it); //old algorythm
+     SortTracksNew();
+     // >> fill tsorted, timage and text
+     if ( ( !s.Contains("EXTF", TString::kIgnoreCase) || !EXT )){ //not forced exteded-alg requested (or exteded-data missing)
+         if( s.Contains("NUC")){
+             if(
+                 tsorted_nuc &&
+                 it < tsorted_nuc->GetEntries() &&                             //enough tracks found
+                 it >= 0 &&                                                //valid index
+                 true) return (PamTrack*)((*tsorted_nuc)[it]);                 //ok return the track
+         }else{
+             if(
+                 tsorted &&
+                 it < tsorted->GetEntries() &&                             //enough tracks found
+                 it >= 0 &&                                                //valid index
+                 true )return (PamTrack*)((*tsorted)[it]);                 //ok return the track
+         }
+     }
+     /////////////////////////////////////////////////////////////////////////
+     /// if requested get track from extended algorythm output
+     /////////////////////////////////////////////////////////////////////////
+     if(s.Contains("EXT", TString::kIgnoreCase) && EXT){//if exteded-alg requested
+         if(s.Contains("NUC")){
+             if(
+                 text_nuc &&
+                 it < text_nuc->GetEntries() &&                             //enough tracks found
+                 it >= 0 &&                                                //valid index
+                 true) return (PamTrack*)((*text_nuc)[it]);
+         }else{
+             if(
+                 text &&
+                 it < text->GetEntries() &&                             //enough tracks found
+                 it >= 0 &&                                                //valid index
+                 true) return (PamTrack*)((*text)[it]);
+         }
+     };
+     cout << "PamTrack *PamLevel2::GetTrack("<<it<<","<<alg<<") -- wrong track number or unrecognised algorithm"<<endl;
+     return NULL;
  }
  ;
+ TClonesArray *PamLevel2::GetTracks() {
+   //  *-*-*-*-*-*-*-*-*-*-*-*-*
+   SortTracks();
+   //  *-*-*-*-*-*-*-*-*-*-*-*-*
+   return tsorted;
+ }
+ ;
+ Int_t  PamLevel2::GetNTracks(const char* alg) {
+ //    cout << " trk_nuc_obj->GetEntries() "<<trk_nuc_obj->GetEntries()<<" trk2_nuc_obj->GetNTracks() "<<trk2_nuc_obj->GetNTracks()<<endl;
+     TString s(alg);
+     if(!s.CompareTo("") || !s.CompareTo("STD"))return trk2_obj->TrkLevel2::GetNTracks(); //standard algorythm
+     if(s.Contains("EXTF", TString::kIgnoreCase) && EXT){
+         if(s.Contains("NUC", TString::kIgnoreCase) && NUC)return trk_ext_nuc_obj->GetEntries();//ok
+         return trk_ext_obj->GetEntries();//ok
+     }
+     if( s.Contains("EXT", TString::kIgnoreCase) && EXT) {
+         if(s.Contains("NUC", TString::kIgnoreCase) && NUC)
+             return (trk2_nuc_obj->TrkLevel2::GetNTracks() ?  trk2_nuc_obj->TrkLevel2::GetNTracks() :  trk_ext_nuc_obj->GetEntries() );
+         return (trk2_obj->TrkLevel2::GetNTracks() ?  trk2_obj->TrkLevel2::GetNTracks() :  trk_ext_obj->GetEntries() );
+     }
+     if(s.Contains("NUC", TString::kIgnoreCase) && NUC )
+         return trk2_nuc_obj->TrkLevel2::GetNTracks();
+     cout << "Int_t  PamLevel2::GetNTracks("<<alg<<") -- unrecognised algorithm"<<endl;
+     return 0;
+ }
  //--------------------------------------
  //
-Line 1816 
 PamTrack *PamLevel2::GetTrack(int it) {
+Line 2765 
 PamTrack *PamLevel2::GetTrack(int it) {
   * Retrieves (if present) the image of the it-th Pamela "physical" track, sorted by the method PamLevel2::SortTracks().
   * @param it Track number, ranging from 0 to GetNTracks().
   */
- PamTrack *PamLevel2::GetTrackImage(int it) {
+ PamTrack *PamLevel2::GetTrackImageOld(int it) {
    //  *-*-*-*-*-*-*-*-*-*-*-*-*
    SortTracks();
-Line 1840 
 PamTrack *PamLevel2::GetTrackImage(int i
+Line 2789 
 PamTrack *PamLevel2::GetTrackImage(int i
      };
    }
    else {
-     cout << "PamLevel2::GetTrackImage(int) : Tracker track SeqNo " << it << " does not exist (GetNTracks() = "
+     cout << "PamLevel2::GetTrackImageOld(int) : Tracker track SeqNo " << it << " does not exist (GetNTracks() = "
          << trk2_obj->TrkLevel2::GetNTracks() << ")" << endl;
    };
    return image;
  }
+ /**
+  * Retrieves (if present) the image of the it-th Pamela "physical" track, sorted by the method PamLevel2::SortTracks().
+  * @param it Track number, ranging from 0 to GetNTracks().
+  * @param alg Algorythm, see SetTrakingAlgorythm(char *alg) for explanation.
+  */
+ PamTrack *PamLevel2::GetTrackImage(int it, const char* alg) {
+     TString s(alg);
+     if(!s.CompareTo("") || !s.CompareTo("STD"))return GetTrackImageOld(it); //old algorythm
+     SortTracksNew();
+     // >> fill tsorted, timage and text
+     if ( ( !s.Contains("EXTF", TString::kIgnoreCase) || !EXT )){ //not forced exteded-alg requested (or exteded-data missing)
+         if( s.Contains("NUC")){
+             if(
+                 tsorted_nuc &&
+                 it < tsorted_nuc->GetEntries() &&                             //enough tracks found
+                 it >= 0 &&                                                //valid index
+                 true){
+                 TClonesArray &t = *(tsorted_nuc);
+                 PamTrack *temp = (PamTrack*) t[it];
+                 if (temp->GetTrkTrack()->HasImage()) {
+                     return (PamTrack*)((*timage_nuc)[it]);                 //ok return the track
+                 }else{
+                     return NULL;
+                 }
+             }
+         }else{
+             if(
+                 tsorted &&
+                 it < tsorted->GetEntries() &&                             //enough tracks found
+                 it >= 0 &&                                                //valid index
+                 true ){
+                 TClonesArray &t = *(tsorted);
+                 PamTrack *temp = (PamTrack*) t[it];
+                 if (temp->GetTrkTrack()->HasImage()) {
+                     return (PamTrack*)((*timage)[it]);                 //ok return the track
+                 }else{
+                     return NULL;
+                 }
+             }
+         }
+     }
+     cout << "PamTrack *PamLevel2::GetTrackImage("<<it<<","<<alg<<") -- wrong track number or unrecognised algorithm"<<endl;
+     return NULL;
+ }
+ ;
  //--------------------------------------
  //
-Line 1935 
 TTree *PamLevel2::GetPamTree(TFile *f, T
+Line 2939 
 TTree *PamLevel2::GetPamTree(TFile *f, T
      if (!Trout)
        Trout = T;
      else
-       Trout->AddFriend(T);
+         Trout->AddFriend(T);
    }
    else {
      cout << "Tracker      : missing tree" << endl;
-Line 2348 
 TChain *PamLevel2::GetPamTree(TList *fl,
+Line 3352 
 TChain *PamLevel2::GetPamTree(TList *fl,
          G->Add(name);
        if (SELLI == 1)
          L->Add(name);
-     };
+      };
    };
-   cout << "done chains\n";
+   cout << "done data-tree chains  "<<  T->GetNtrees() <<" \n";
-   cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" << endl;
+   cout << "----------------------------------------------------" << endl;
    // -------------------------------------------
    // make friends
-Line 2435 
 TChain *PamLevel2::GetPamTree(TList *fl,
+Line 3439 
 TChain *PamLevel2::GetPamTree(TList *fl,
    //  =====================================
    //  SET BRANCH-ADDRESS AFTER CHAIN+FRIEND
    //  =====================================
-   SetBranchAddress(Trout);
+   if( Trout->GetNtrees() )SetBranchAddress(Trout);
    //  ------------------------------------
    //  finally handle selection trees...
    //  (it is not friend of pamela tree)
    //  ------------------------------------
-   cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" << endl;
+   cout << "----------------------------------------------------" << endl;
    // Selection List
    if (L && SELLI == 1) {
-Line 2463 
 TChain *PamLevel2::GetPamTree(TList *fl,
+Line 3467 
 TChain *PamLevel2::GetPamTree(TList *fl,
      //          if(!Trout)Trout=O;
      //          else Trout->AddFriend("SelectionList");
      cout << "+SelectionList" << endl;
-     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" << endl;
+     cout << "----------------------------------------------------" << endl;
    }
    else {
      //  cout << "SelectionList  : missing tree"<<endl;
-Line 2489 
 TChain *PamLevel2::GetPamTree(TList *fl,
+Line 3493 
 TChain *PamLevel2::GetPamTree(TList *fl,
   */
  void PamLevel2::SetBranchAddress(TTree *t) {
-   TRK2 = TRK2 & t->GetBranchStatus("TrkLevel2");
+ //   TRK2 = TRK2 & t->GetBranchStatus("TrkLevel2");
-   TRK1 = TRK1 & t->GetBranchStatus("TrkLevel1");
+ //   TRK1 = TRK1 & t->GetBranchStatus("TrkLevel1");
-   TRKh = TRKh & t->GetBranchStatus("TrkHough");
+ //   TRKh = TRKh & t->GetBranchStatus("TrkHough");
-   CAL2 = CAL2 & t->GetBranchStatus("CaloLevel2");
+ //   CAL2 = CAL2 & t->GetBranchStatus("CaloLevel2");
-   CAL1 = CAL1 & t->GetBranchStatus("CaloLevel1");
+ //   CAL1 = CAL1 & t->GetBranchStatus("CaloLevel1");
-   TOF = TOF & t->GetBranchStatus("ToFLevel2");
+ //   TOF = TOF & t->GetBranchStatus("ToFLevel2");
-   TRG = TRG & t->GetBranchStatus("TrigLevel2");
+ //   TRG = TRG & t->GetBranchStatus("TrigLevel2");
-   S4 = S4 & t->GetBranchStatus("S4Level2");
+ //   S4 = S4 & t->GetBranchStatus("S4Level2");
-   ND = ND & t->GetBranchStatus("NDLevel2");
+ //   ND = ND & t->GetBranchStatus("NDLevel2");
-   AC = AC & t->GetBranchStatus("AcLevel2");
+ //   AC = AC & t->GetBranchStatus("AcLevel2");
-   ORB = ORB & t->GetBranchStatus("OrbitalInfo");
+ //   ORB = ORB & t->GetBranchStatus("OrbitalInfo");
-   GP = GP & t->GetBranchStatus("h20");
+ //   GP = GP & t->GetBranchStatus("h20");
    // Tracker
    if (TRK1) {
-Line 2510 
 void PamLevel2::SetBranchAddress(TTree *
+Line 3515 
 void PamLevel2::SetBranchAddress(TTree *
    if (TRK2) {
      t->SetBranchAddress("TrkLevel2", GetPointerTo("TrkLevel1"));
      cout << "Tracker      : set branch address TrkLevel2" << endl;
+     NUC = t->GetBranchStatus("TrackNuclei");
+     EXT = t->GetBranchStatus("RecoveredTrack") && (NUC ? t->GetBranchStatus("RecoveredTrackNuclei"): true );
    };
    if (TRKh) {
      t->SetBranchAddress("TrkHough", GetPointerTo("TrkHough"));
-Line 2570 
 void PamLevel2::SetBranchAddress(TTree *
+Line 3577 
 void PamLevel2::SetBranchAddress(TTree *
      cout << "h20          : set branch address GPamela " << endl;
    };
+   if(NUC){
+       cout << "Found nuclei-track branches" << endl;
+       if( !trk_nuc_obj )trk_nuc_obj = new TClonesArray("TrkTrack");
+       if( !calo_nuc_obj)calo_nuc_obj= new TClonesArray("CaloTrkVar");
+       if( !tof_nuc_obj)tof_nuc_obj= new TClonesArray("ToFTrkVar");
+       if( !orb_nuc_obj)orb_nuc_obj= new TClonesArray("OrbitalInfoTrkVar");
+       if (TRK2)t->                          SetBranchAddress("TrackNuclei",&trk_nuc_obj);
+       if (CAL2)t->GetFriend("Calorimeter")->SetBranchAddress("TrackNuclei",&calo_nuc_obj);
+       if (TOF )t->GetFriend("ToF")->        SetBranchAddress("TrackNuclei",&tof_nuc_obj);
+       if (ORB )t->GetFriend("OrbitalInfo")->SetBranchAddress("TrackNuclei",&orb_nuc_obj);
+       ///copy the vector content inside a "fake" object (all aother info are missing)
+       if( !trk2_nuc_obj )trk2_nuc_obj =  new TrkLevel2();
+       if( !calo2_nuc_obj )calo2_nuc_obj =  new CaloLevel2();
+       if( !tof2_nuc_obj )tof2_nuc_obj =  new ToFLevel2();
+       if( !orb2_nuc_obj )orb2_nuc_obj =  new OrbitalInfo();
+ //       *(trk2_nuc_obj->GetPointerToTrackArray()) = new TClonesArray(*trk_nuc_obj);
+ //       *(calo2_nuc_obj->GetPointerToTrackArray()) = new TClonesArray(*calo_nuc_obj);
+ //       *(tof2_nuc_obj->GetPointerToTrackArray()) = new TClonesArray(*tof_nuc_obj);
+ //       *(orb2_nuc_obj->GetPointerToTrackArray()) = new TClonesArray(*orb_nuc_obj);
+       trk2_nuc_obj->SetTrackArray(  trk_nuc_obj  );
+       calo2_nuc_obj->SetTrackArray( calo_nuc_obj );
+       tof2_nuc_obj->SetTrackArray(  tof_nuc_obj  );
+       orb2_nuc_obj->SetTrackArray(  orb_nuc_obj  );
+   }
+   if(EXT){
+       cout << "Found extended tracking algorythm branches" << endl;
+       if( !trk_ext_obj )trk_ext_obj = new TClonesArray("ExtTrack");
+       if( !calo_ext_obj)calo_ext_obj= new TClonesArray("CaloTrkVar");
+       if( !tof_ext_obj)tof_ext_obj= new TClonesArray("ToFTrkVar");
+       if( !orb_ext_obj)orb_ext_obj= new TClonesArray("OrbitalInfoTrkVar");
+       if (TRK2)t->                          SetBranchAddress("RecoveredTrack",&trk_ext_obj);
+       if (CAL2)t->GetFriend("Calorimeter")->SetBranchAddress("RecoveredTrack",&calo_ext_obj);
+       if (TOF )t->GetFriend("ToF")->        SetBranchAddress("RecoveredTrack",&tof_ext_obj);
+       if (ORB )t->GetFriend("OrbitalInfo")->SetBranchAddress("RecoveredTrack",&orb_ext_obj);
+       if(NUC){
+           if( !trk_ext_nuc_obj )trk_ext_nuc_obj = new TClonesArray("ExtTrack");
+           if( !calo_ext_nuc_obj)calo_ext_nuc_obj= new TClonesArray("CaloTrkVar");
+           if( !tof_ext_nuc_obj)tof_ext_nuc_obj= new TClonesArray("ToFTrkVar");
+           if( !orb_ext_nuc_obj)orb_ext_nuc_obj= new TClonesArray("OrbitalInfoTrkVar");
+           if (TRK2)t->                          SetBranchAddress("RecoveredTrackNuclei",&trk_ext_nuc_obj);
+           if (CAL2)t->GetFriend("Calorimeter")->SetBranchAddress("RecoveredTrackNuclei",&calo_ext_nuc_obj);
+           if (TOF )t->GetFriend("ToF")->        SetBranchAddress("RecoveredTrackNuclei",&tof_ext_nuc_obj);
+           if (ORB )t->GetFriend("OrbitalInfo")->SetBranchAddress("RecoveredTrackNuclei",&orb_ext_nuc_obj);
+       }
+   }
  }
  /**
   * Set branch addresses for Pamela friend trees
-Line 2594 
 void PamLevel2::SetBranchAddress(TChain
+Line 3658 
 void PamLevel2::SetBranchAddress(TChain
    if (TRK2) {
      t->SetBranchAddress("TrkLevel2", GetPointerTo("TrkLevel2"));
      cout << "Tracker      : set branch address TrkLevel2" << endl;
+     NUC = t->GetBranchStatus("TrackNuclei");
+     EXT = t->GetBranchStatus("RecoveredTrack") && (NUC ? t->GetBranchStatus("RecoveredTrackNuclei"): true );
    };
    if (TRK1) {
      t->SetBranchAddress("TrkLevel1", GetPointerTo("TrkLevel1"));
-Line 2607 
 void PamLevel2::SetBranchAddress(TChain
+Line 3673 
 void PamLevel2::SetBranchAddress(TChain
    // Calorimeter
    if (CAL2) {
      t->SetBranchAddress("CaloLevel2", GetPointerTo("CaloLevel2"));
      cout << "Calorimeter  : set branch address CaloLevel2" << endl;
    };
    if (CAL1) {
      t->SetBranchAddress("CaloLevel1", GetPointerTo("CaloLevel1"));
-Line 2665 
 void PamLevel2::SetBranchAddress(TChain
+Line 3731 
 void PamLevel2::SetBranchAddress(TChain
    //    cout << "SelectionList: set branch address EventEntry"<<endl;
    //     }
+   if(NUC){
+       cout << "Found nuclei-track branches" << endl;
+       if( !trk_nuc_obj )trk_nuc_obj = new TClonesArray("TrkTrack");
+       if( !calo_nuc_obj)calo_nuc_obj= new TClonesArray("CaloTrkVar");
+       if( !tof_nuc_obj)tof_nuc_obj= new TClonesArray("ToFTrkVar");
+       if( !orb_nuc_obj)orb_nuc_obj= new TClonesArray("OrbitalInfoTrkVar");
+       if (TRK2)t->                          SetBranchAddress("TrackNuclei",&trk_nuc_obj);
+       if (CAL2)t->GetFriend("Calorimeter")->SetBranchAddress("TrackNuclei",&calo_nuc_obj);
+       if (TOF )t->GetFriend("ToF")->        SetBranchAddress("TrackNuclei",&tof_nuc_obj);
+       if (ORB )t->GetFriend("OrbitalInfo")->SetBranchAddress("TrackNuclei",&orb_nuc_obj);
+       ///copy the vector content inside a "fake" object (all aother info are missing)
+       if( !trk2_nuc_obj )trk2_nuc_obj =  new TrkLevel2();
+       if( !calo2_nuc_obj )calo2_nuc_obj =  new CaloLevel2();
+       if( !tof2_nuc_obj )tof2_nuc_obj =  new ToFLevel2();
+       if( !orb2_nuc_obj )orb2_nuc_obj =  new OrbitalInfo();
+ //       *(trk2_nuc_obj->GetPointerToTrackArray()) = new TClonesArray(*trk_nuc_obj);
+ //       *(calo2_nuc_obj->GetPointerToTrackArray()) = new TClonesArray(*calo_nuc_obj);
+ //       *(tof2_nuc_obj->GetPointerToTrackArray()) = new TClonesArray(*tof_nuc_obj);
+ //       *(orb2_nuc_obj->GetPointerToTrackArray()) = new TClonesArray(*orb_nuc_obj);
+       trk2_nuc_obj->SetTrackArray(  trk_nuc_obj  );
+       calo2_nuc_obj->SetTrackArray( calo_nuc_obj );
+       tof2_nuc_obj->SetTrackArray(  tof_nuc_obj  );
+       orb2_nuc_obj->SetTrackArray(  orb_nuc_obj  );
+   }
+   if(EXT){
+       cout << "Found extended tracking algorythm branches" << endl;
+       t->SetBranchAddress("extAlgFlag",&extAlgFlag);
+       if( !trk_ext_obj )trk_ext_obj = new TClonesArray("ExtTrack");
+       if( !calo_ext_obj)calo_ext_obj= new TClonesArray("CaloTrkVar");
+       if( !tof_ext_obj)tof_ext_obj= new TClonesArray("ToFTrkVar");
+       if( !orb_ext_obj)orb_ext_obj= new TClonesArray("OrbitalInfoTrkVar");
+       if (TRK2)t->                          SetBranchAddress("RecoveredTrack",&trk_ext_obj);
+       if (CAL2)t->GetFriend("Calorimeter")->SetBranchAddress("RecoveredTrack",&calo_ext_obj);
+       if (TOF )t->GetFriend("ToF")->        SetBranchAddress("RecoveredTrack",&tof_ext_obj);
+       if (ORB )t->GetFriend("OrbitalInfo")->SetBranchAddress("RecoveredTrack",&orb_ext_obj);
+       if(NUC){
+           if( !trk_ext_nuc_obj )trk_ext_nuc_obj = new TClonesArray("ExtTrack");
+           if( !calo_ext_nuc_obj)calo_ext_nuc_obj= new TClonesArray("CaloTrkVar");
+           if( !tof_ext_nuc_obj)tof_ext_nuc_obj= new TClonesArray("ToFTrkVar");
+           if( !orb_ext_nuc_obj)orb_ext_nuc_obj= new TClonesArray("OrbitalInfoTrkVar");
+           if (TRK2)t->                          SetBranchAddress("RecoveredTrackNuclei",&trk_ext_nuc_obj);
+           if (CAL2)t->GetFriend("Calorimeter")->SetBranchAddress("RecoveredTrackNuclei",&calo_ext_nuc_obj);
+           if (TOF )t->GetFriend("ToF")->        SetBranchAddress("RecoveredTrackNuclei",&tof_ext_nuc_obj);
+           if (ORB )t->GetFriend("OrbitalInfo")->SetBranchAddress("RecoveredTrackNuclei",&orb_ext_nuc_obj);
+       }
+   }
  }
+ /**
+  * Set the tracking algorythm
+  * @param alg String to choose the track.
+  * "" --> take the output of the standard tracking algorythm
+  * "STD" --> take the output of the standard tracking algorythm
+  * "NUC" --> take the output of the standard tracking algorythm for nuclei cluster selection
+  * "EXT" --> in case the standard tracking algorythm has not found any track, take the output of the extended one
+  * "EXTF" --> force the extended tracking algorythm
+  * "NUCEXT" --> as "EXT", but for nuclei
+  * "NUCEXTF" --> as "EXTF", but for nuclei
+  */
+ // void PamLevel2::SetTrackingAlgorythm(const char *alg){
+ //     TString s(alg);
+ //     if(s.Contains("NUC", TString::kIgnoreCase) && !NUC)
+ //      cout << "Warning! NUC algorythm requested, but branches are missing"<<endl;
+ //     if(s.Contains("EXT", TString::kIgnoreCase) && !EXT)
+ //      cout << "Warning! EXT algorythm requested, but branches are missing"<<endl;;
+ //     trkAlg = alg;
+ // };
+ // const char* PamLevel2::GetTrackingAlgorythm(){
+ //     cout<<endl<<" Implemented tracking algorythm: ";
+ //     cout<<endl<<"  \"\" or \"STD\"  --> take the output of the standard tracking algorythm";
+ //     cout<<endl<<"  \"NUC\"      --> take the output of the standard tracking algorythm for nuclei cluster selection";
+ //     cout<<endl<<"  \"EXT\"      --> in case the standard tracking algorythm has not found any track,";
+ //     cout<<endl<<"                 take the output of the extended one";
+ //     cout<<endl<<"  \"EXTF\"     --> force the extended tracking algorythm";
+ //     cout<<endl<<"  \"NUCEXT\"   --> as \"EXT\", but for nuclei ";
+ //     cout<<endl<<"  \"NUCEXTF\"  --> as \"EXTF\", but for nuclei";
+ //     cout<<endl;
+ //     cout<<" <<Currently set algorythm>> "<<trkAlg<<endl;
+ //     cout<<endl;
+ //     return trkAlg;
+ // };
  //--------------------------------------
  //
  //
-Line 2701 
 TChain *PamLevel2::GetRunTree(TList *fl)
+Line 3868 
 TChain *PamLevel2::GetRunTree(TList *fl)
      };
    }
+   cout << "done run chain  "<<  R->GetNtrees() <<" \n";
    if (RUN && R->GetNtrees()) {
      R->SetBranchAddress("RunInfo", GetPointerTo("RunInfo"));
-Line 2740 
 TChain *PamLevel2::GetRunTree(TList *fl)
+Line 3910 
 TChain *PamLevel2::GetRunTree(TList *fl)
      cout << "----------------------------------------------------" << endl;
    }
-   else {
+ //   else {
-     delete R;
+ //     delete R;
-     R = 0;
+ //     R = 0;
-   }
+ //   }
    run_tree = R;
-Line 3608 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4778 
 Bool_t PamLevel2::CheckLevel2File(TStrin
    TFile *f = new TFile(name.Data());
    if (!f || f->IsZombie()) {
      cout << "File: " << f->GetName() << " discarded ---- Non valid root file" << endl;
+     fDiscarded = true;
      return false;
    }
    //    cout << "Get list of keys: "<<f<<endl;
-Line 3646 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4817 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- SelectionList tree has " << nevt
                << " events instead of " << nev << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3660 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4832 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- Trigger tree has " << nevt << " events instead of "
                << nev << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3673 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4846 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- ToF tree has " << nevt << " events instead of " << nev
                << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3686 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4860 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- S4 tree has " << nevt << " events instead of " << nev
                << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3700 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4875 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- NeutronD tree has " << nevt << " events instead of "
                << nev << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3713 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4889 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- Anticounter tree has " << nevt << " events instead of "
                << nev << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3726 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4903 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- OrbitalInfo tree has " << nevt << " events instead of "
                << nev << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3739 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4917 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- Tracker tree has " << nevt << " events instead of "
                << nev << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3762 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4941 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- Calorimeter tree has " << nevt << " events instead of "
                << nev << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3784 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4964 
 Bool_t PamLevel2::CheckLevel2File(TStrin
          if (nev && nevt != nev) {
            cout << "File: " << f->GetName() << " discarded ---- h20 tree has " << nevt << " events instead of " << nev
                << endl;
+           fDiscarded = true;
            return false;
          }
          nev = nevt;
-Line 3796 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4977 
 Bool_t PamLevel2::CheckLevel2File(TStrin
      SELLI = (Int_t) SELLI__ok;
    if (SELLI == 0 && SELLI__ok) {
      cout << "File: " << f->GetName() << " discarded ---- found SelectionList (it is not a full-event file)" << endl;
+     fDiscarded = true;
      return false;
    }
    if (SELLI == 1 && !SELLI__ok) {
      cout << "File: " << f->GetName() << " discarded ---- SelectionList missing" << endl;
+     fDiscarded = true;
      return false;
    }
-Line 3838 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 5021 
 Bool_t PamLevel2::CheckLevel2File(TStrin
    if (CAL1 && !CAL1__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing CaloLevel1 branch" << endl;
+     fDiscarded = true;
      return false;
    };
    if (CAL2 && !CAL2__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing CaloLevel2 branch" << endl;
+     fDiscarded = true;
      return false;
    };
    if (TRK2 && !TRK2__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing TrkLevel2 branch" << endl;
+     fDiscarded = true;
      return false;
    };
    if (TRK1 && !TRK1__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing TrkLevel1 branch" << endl;
+     fDiscarded = true;
      return false;
    };
    if (TRKh && !TRKh__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing TrkHough branch" << endl;
+     fDiscarded = true;
      return false;
    };
    if (ORB && !ORB__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing ORB tree" << endl;
+     fDiscarded = true;
      return false;
    };
    if (AC && !AC__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing AC tree" << endl;
+     fDiscarded = true;
      return false;
    };
    if (S4 && !S4__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing S4 tree" << endl;
+     fDiscarded = true;
      return false;
    };
    if (TOF && !TOF__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing ToF tree" << endl;
+     fDiscarded = true;
      return false;
    };
    if (ND && !ND__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing ND tree" << endl;
+     fDiscarded = true;
      return false;
    };
    if (TRG && !TRG__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing Trigger tree" << endl;
+     fDiscarded = true;
      return false;
    };
    if (GP && !GP__ok) {
      cout << "File: " << f->GetName() << " discarded ---- Missing h20 tree" << endl;
+     fDiscarded = true;
      return false;
    };
-Line 4015 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5210 
 void PamLevel2::CreateCloneTrees(TFile *
        pam_tree_clone[i]->Branch("TrkHough", "TrkHough", GetPointerTo("TrkHough"));
        cout << "Tracker      : branch TrkHough" << endl;
      };
+     if(NUC){
+         pam_tree_clone[i]->Branch("TrackNuclei","TClonesArray",&trk_nuc_obj);
+         cout << "Tracker      : branch TrackNuclei" << endl;
+     }
+     if(EXT){
+         pam_tree_clone[i]->Branch("extAlgFlag",&extAlgFlag,"extAlgFlag/I");
+         pam_tree_clone[i]->Branch("RecoveredTrack","TClonesArray",&trk_ext_obj);
+         cout << "Tracker      : branch RecoveredTrack" << endl;
+         if(NUC){
+             pam_tree_clone[i]->Branch("RecoveredTrackNuclei","TClonesArray",&trk_ext_nuc_obj);
+             cout << "Tracker      : branch RecoveredTrackNuclei" << endl;
+         }
+     }
      i++;
    }
-Line 4029 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5238 
 void PamLevel2::CreateCloneTrees(TFile *
        pam_tree_clone[i]->Branch("CaloLevel2", "CaloLevel2", GetPointerTo("CaloLevel2"));
        cout << "Calorimeter  : branch CaloLevel2" << endl;
      };
+     if(NUC){
+         pam_tree_clone[i]->Branch("TrackNuclei","TClonesArray",&calo_nuc_obj);
+         cout << "Calorimeter  : branch TrackNuclei" << endl;
+     }
+     if(EXT){
+         pam_tree_clone[i]->Branch("RecoveredTrack","TClonesArray",&calo_ext_obj);
+         cout << "Calorimeter  : branch RecoveredTrack" << endl;
+         if(NUC){
+             pam_tree_clone[i]->Branch("RecoveredTrackNuclei","TClonesArray",&calo_ext_nuc_obj);
+             cout << "Calorimeter  : branch RecoveredTrackNuclei" << endl;
+         }
+     }
      i++;
    }
-Line 4037 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5258 
 void PamLevel2::CreateCloneTrees(TFile *
      pam_tree_clone[i] = new TTree("ToF", "PAMELA ToF level2 data ");
      pam_tree_clone[i]->Branch("ToFLevel2", "ToFLevel2", GetPointerTo("ToFLevel2"));
      cout << "ToF          : branch ToFLevel2" << endl;
+     if(NUC){
+         pam_tree_clone[i]->Branch("TrackNuclei","TClonesArray",&tof_nuc_obj);
+         cout << "ToF          : branch TrackNuclei" << endl;
+     }
+     if(EXT){
+         pam_tree_clone[i]->Branch("RecoveredTrack","TClonesArray",&tof_ext_obj);
+         cout << "ToF          : branch RecoveredTrack" << endl;
+         if(NUC){
+             pam_tree_clone[i]->Branch("RecoveredTrackNuclei","TClonesArray",&tof_ext_nuc_obj);
+             cout << "ToF          : branch RecoveredTrackNuclei" << endl;
+         }
+     }
      i++;
    };
    // Trigger
-Line 4072 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5305 
 void PamLevel2::CreateCloneTrees(TFile *
      pam_tree_clone[i] = new TTree("OrbitalInfo", "PAMELA orbital info  ");
      pam_tree_clone[i]->Branch("OrbitalInfo", "OrbitalInfo", GetPointerTo("OrbitalInfo"));
      cout << "OrbitalInfo  : branch OrbitalInfo" << endl;
+     if(NUC){
+         pam_tree_clone[i]->Branch("TrackNuclei","TClonesArray",&orb_nuc_obj);
+         cout << "OrbitalInfo  : branch TrackNuclei" << endl;
+     }
+     if(EXT){
+         pam_tree_clone[i]->Branch("RecoveredTrack","TClonesArray",&orb_ext_obj);
+         cout << "OrbitalInfo  : branch RecoveredTrack" << endl;
+         if(NUC){
+             pam_tree_clone[i]->Branch("RecoveredTrackNuclei","TClonesArray",&orb_ext_nuc_obj);
+             cout << "OrbitalInfo  : branch RecoveredTrackNuclei" << endl;
+         }
+     }
      i++;
    };
    // GPamela
-Line 4081 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5326 
 void PamLevel2::CreateCloneTrees(TFile *
      cout << "GPamela  : branch GPamela" << endl;
      i++;
    };
    cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" << endl;
  }
-Line 4141 
 void PamLevel2::WriteCloneTrees() {
+Line 5388 
 void PamLevel2::WriteCloneTrees() {
    for (Int_t i = 0; i < NCLONES; i++) {
      if (pam_tree_clone[i]) {
        cout << pam_tree_clone[i]->GetName() << endl;
-       pam_tree_clone[i]->Write();
+       pam_tree_clone[i]->Write(pam_tree_clone[i]->GetName(),TObject::kOverwrite);
      };
    }
    cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" << endl;
-Line 4765 
 Long64_t PamLevel2::GetReadEntry() {
+Line 6012 
 Long64_t PamLevel2::GetReadEntry() {
  void PamLevel2::SetSortingMethod(TString how) {
    if (howtosort != how) {
      issorted = false;
+     issorted_new = false;
    }
    howtosort = how;
  }

 Legend:



Removed from v.1.94
 


changed lines


 
Added in v.1.98
 Legend:



Removed from v.1.94
 


changed lines


 
Added in v.1.98
-Removed from v.1.94
+Added in v.1.98

	ViewVC Help
Powered by ViewVC 1.1.23