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

Diff of /PamelaLevel2/src/PamLevel2.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 1.87 by pam-fi,
Fri May 14 15:30:05 2010 UTC
+revision 1.99 by mocchiut,
Fri Oct 17 15:08:35 2014 UTC
 Line 30 
 void GPamela::Clear() {
  void GPamela::Delete() {
    Clear();
+   /* EM all these are in the stack not in the heap, so no need to delete by hand...
    delete[] Ipltof;
    delete[] Ipaddle;
    delete[] Ipartof;
 Line 131 
 void GPamela::Delete() {
    delete[] Timecard;
    delete[] Pathcard;
    delete[] P0card;
+   */
  }
- ;
  void GPamela::SetBranchAddress(TChain* fhBookTree) {
 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 394 
 void PamTrack::Delete() {
+Line 469 
 void PamTrack::Delete() {
  PamLevel2::PamLevel2() {
    Initialize();
  }
- ;
  /**
   * Constructor
-Line 417 
 PamLevel2::PamLevel2(TString ddir, TStri
+Line 492 
 PamLevel2::PamLevel2(TString ddir, TStri
      GetPamTree(listf, detlist);
    if (listf)
      GetRunTree(listf);
+   SetMaxShift(-1);
  }
- ;
  PamLevel2::PamLevel2(TString ddir, TList *llist, TString detlist) {
    Initialize();
    GetPamTree(llist, detlist);
    GetRunTree(llist);
+   SetMaxShift(-1);
  }
- ;
  /**
   * Constructor
   * @param ddir Name of directory where level2 files are stored.
-Line 435 
 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);
+   SetMaxShift(-1);
  }
- ;
  void PamLevel2::Initialize() {
-Line 452 
 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;
    irunt = -1LL;
+   totrunentry = 0LL;
+   totrunentrymax = 0LL;
+   totrunentrymin = 0LL;
    runfirstentry = 0LL;
    runlastentry = 0LL;
    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;
    l0_file = NULL;
    l0_tree = NULL;
-Line 475 
 void PamLevel2::Initialize() {
+Line 587 
 void PamLevel2::Initialize() {
    dbc = 0;
    prevshift = 0;
-   maxshift = 10; //EMILIANO
+   yprevshift = 0;
+   maxshift = 10; //EMILIANO now overridden by SetMaxShift(-1) called by constructors
    run_tree = NULL;
    run_tree_clone = NULL;
-Line 528 
 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 538 
 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 545 
 void PamLevel2::Initialize() {
+Line 667 
 void PamLevel2::Initialize() {
    issorted = false;
    lastsorted = -1;
+   issorted_new = false;
+   lastsorted_new = -1;
  }
  ;
-Line 575 
 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 585 
 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 598 
 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 647 
 void PamLevel2::Delete() {
+Line 813 
 void PamLevel2::Delete() {
      run_tree->Delete();;
    if (sel_tree)
      sel_tree->Delete();;
-   for (Int_t i = 0; i < NCLONES; i++)
+   // The following lines are commented out since they may generate a double delete error
+   // if the file containing the clone trees is closed. This is because the file owns the
+   // clone trees which are written into it, so it will delete them when it is closed; if
+   // also PamLevel2 will try to delete these trees, a double delete error will be generated
+   // when exiting from analysis program. (Nicola 28/11/2011)
+   /*for (Int_t i = 0; i < NCLONES; i++)
      if (pam_tree_clone[i])
        pam_tree_clone[i]->Delete();;
    if (run_tree_clone)
      run_tree_clone->Delete();;
    if (sel_tree_clone)
-     sel_tree_clone->Delete();;
+     sel_tree_clone->Delete();;*/
    if (irunoffset)
      delete[] irunoffset;
+   Initialize();
  }
  ;
-Line 691 
 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 701 
 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 779 
 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 793 
 void PamLevel2::Reset() {
+Line 1017 
 void PamLevel2::Reset() {
    soft_obj = 0;// Emiliano
    irun = -1;
    irunt = -1;
+   totrunentry = 0LL;
+   totrunentrymax = 0LL;
+   totrunentrymin = 0LL;
    runfirstentry = 0ULL;
    runlastentry = 0ULL;
+   prevabstime = 0ULL;
+   prevpktnum = 0;
+   abstime = 0ULL;
+   pktnum = 0;
+   isFragment = false;
    //
    totdltime[0] = 0LL;
    totdltime[1] = 0LL;
-Line 812 
 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 822 
 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 848 
 void PamLevel2::SkipRunInfoUpdate(){
+Line 1080 
 void PamLevel2::SkipRunInfoUpdate(){
    };
  }
+ void PamLevel2::SetMaxShift(Int_t sh){
+   if ( sh >=  0 ){
+     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 = GetEntries();
+     ULong64_t runnev = 0ULL;
+     for (Int_t r=0; r< run_tree->GetEntries();r++){
+       run_tree->GetEntry(r);//update runinfo
+       runnev += GetRunInfo()->NEVENTS;
+     }
+     maxshift = (Int_t)(runnev-nev) + 10; // +10 just to be conservative
+     if ( (runnev-nev) == 0 ) isSync = true;
+     if (DBG) printf("PamLevel2::SetMaxShift(Int_t_) - sh negative %i - nev is %lld runnnev is %lld so maxshift set to %i \n",sh,nev,runnev,maxshift);
+     //    printf("PamLevel2::SetMaxShift(Int_t_) - sh negative %i - nev is %lld runnnev is %lld so maxshift set to %i \n",sh,nev,runnev,maxshift); // TOGLITOGLI
+   }
+ }
  //--------------------------------------
  //
  //
-Line 890 
 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 917 
 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 989 
 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 1002 
 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 1027 
 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 1059 
 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 1071 
 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 1204 
 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 1327 
 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 1344 
 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 1362 
 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 1371 
 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 1382 
 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 1391 
 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 1400 
 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 1409 
 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 1420 
 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 1429 
 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 1438 
 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 1482 
 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 1503 
 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 1678 
 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 1686 
 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 1696 
 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 1772 
 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 1796 
 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 1891 
 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 2304 
 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 2391 
 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 2408 
 TChain *PamLevel2::GetPamTree(TList *fl,
+Line 3456 
 TChain *PamLevel2::GetPamTree(TList *fl,
      cout << "SelectionList: set branch address RunEntry" << endl;
      L->SetBranchAddress("EventEntry", &irunentry);
      cout << "SelectionList: set branch address EventEntry" << endl;
+     /*    if ( L->GetBranch("L0EventEntry") ){
+       hasL0EE = true;
+       L->SetBranchAddress("L0EventEntry", &il0entry);
+       cout << "SelectionList: set branch address L0EventEntry" << endl;
+     } else {
+       hasL0EE = false; // backward compatibility with old preselected files...
+       }*/
      sel_tree = L;
      //          if(!Trout)Trout=O;
      //          else Trout->AddFriend("SelectionList");
      cout << "+SelectionList" << endl;
-     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" << endl;
+     cout << "----------------------------------------------------" << endl;
    }
    else {
      //  cout << "SelectionList  : missing tree"<<endl;
-Line 2438 
 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 2459 
 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 2519 
 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 2543 
 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 2556 
 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 2614 
 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 2650 
 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 2689 
 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 2731 
 TTree *PamLevel2::GetRunTree(TFile *f) {
+Line 3952 
 TTree *PamLevel2::GetRunTree(TFile *f) {
    return T;
  }
- /**
-  * Update the runinfo informations (to be used to have Run infos event by event basis)
-  * @param run Pointer to the chain/tree which contains run infos
-  * @return true if a new run has been read, false if it is still the same run
-  */
- Bool_t PamLevel2::UpdateRunInfo(TChain *run, Long64_t iev) {
-   //
-   // check if we have already called once GetEntry, if not call it
-   //
-   cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, Long64_t iev) --- ATTENZIONE --- NON E` MANTENUTA!!!!!!!.... "
-       << endl;
-   if (!run) {
-     cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- missing RunInfo tree " << endl;
-     return (false);
-   }
-   if (run->GetEntries() <= 0)
-     return (false);
-   //
-   //  Int_t oldrun = irun;
-   Long64_t oldrun = irun;
-   // --------------------------------------
-   // if it is a full file (not preselected)
-   // --------------------------------------
-   if (SELLI == 0) {
-     //
-     // the absolute time is necessary to relate the event with the run
-     //
-     if (!GetOrbitalInfo() && !ISGP) {
-       cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- missing OrbitalInfo " << endl;
-       return (false);
-     }
-     ULong64_t abstime = 0;
-     if (GetOrbitalInfo())
-       abstime = GetOrbitalInfo()->absTime;
-     //
-     // the first time the routine is called, set run search from the beginning
-     //
-     if (irun < 0LL) {
-       irun = 0LL;
-       run->GetEntry(irun);
-       runfirstentry = 0LL;
-       runlastentry += (Long64_t)(this->GetRunInfo()->NEVENTS);
-       if ((Long64_t)(this->GetRunInfo()->NEVENTS) > 0LL)
-         runlastentry -= 1LL;
-       if (ISGP && run->GetEntries() != 1) {
-         cout << "** WARNING ** simulated files are assumed to have 1 single run, not " << run->GetEntries() << endl;
-         cout << "** WARNING ** run will not be updated" << endl;
-       }
-     };
-     //
-     if (ISGP)
-       abstime = GetRunInfo()->RUNHEADER_TIME; // BARBATRUCCO
-     //
-     if (irun == run->GetEntries() - 1LL && !(abstime >= GetRunInfo()->RUNHEADER_TIME && abstime
-         <= GetRunInfo()->RUNTRAILER_TIME)) {
-       irun = -1LL;
-       irunt = -1LL;
-       runfirstentry = 0LL;
-       runlastentry = -1LL;
-     };
-     // modificato il controllo sull'aggiornamento del run, per evitare problemi
-     // dovuti agli eventi annidati (NB! NEVENTS conta anche questi!!)
-     //
-     bool fromfirst = true;
-     //
-     while (!(abstime >= GetRunInfo()->RUNHEADER_TIME && abstime <= GetRunInfo()->RUNTRAILER_TIME) && irun
-         < run->GetEntries() - 1LL) {
-       //      while ( iev > (runfirstentry+(ULong64_t)(this->GetRunInfo()->NEVENTS-1)) && irun < run->GetEntries() ){
-       irun++;
-       run->GetEntry(irun);
-       runfirstentry = runlastentry;
-       if ((Long64_t)(this->GetRunInfo()->NEVENTS) > 0LL)
-         runfirstentry += 1LL;
-       runlastentry += (Long64_t)(this->GetRunInfo()->NEVENTS);
-       //          cout << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
-       //          cout << "runfirstentry "<<runfirstentry<<endl;
-       //          printf(" iev %llu %u %llu \n",iev,this->GetRunInfo()->NEVENTS,(ULong64_t)(runfirstentry+(ULong64_t)(this->GetRunInfo()->NEVENTS)));
-       //          printf(" abstime %u trailertime %u \n",abstime,GetRunInfo()->RUNTRAILER_TIME);
-       //          printf(" IDRUN %u \n",GetRunInfo()->ID);
-       //
-       //          prevshift = 0;
-       //
-       if (irun == (Long64_t)(run->GetEntries() - 1LL) && fromfirst && !(abstime >= GetRunInfo()->RUNHEADER_TIME
-           && abstime <= GetRunInfo()->RUNTRAILER_TIME)) {
-         printf(" resetting irun  (it should NOT happen!!!)\n");
-         fromfirst = false;
-         irun = 0;
-         run->GetEntry(irun);
-         runfirstentry = 0ULL;
-         runlastentry += (Long64_t)(this->GetRunInfo()->NEVENTS);
-         if ((Long64_t)(this->GetRunInfo()->NEVENTS) > 0LL)
-           runlastentry -= 1LL;
-       };
-       //
-     };
-     //
-     if (!(abstime >= GetRunInfo()->RUNHEADER_TIME && abstime <= GetRunInfo()->RUNTRAILER_TIME)) {
-       printf(" Something very wrong here: cannot find RUN containing absolute time %llu \n", abstime);
-       return false;
-     }
-     //
-     if (irun == oldrun || irun >= run->GetEntries())
-       return (false);
-     //
-     //  printf(" iev %llu irun %i nevents %u 1st %llu last %llu \n",iev,irun,this->GetRunInfo()->NEVENTS,(ULong64_t)runfirstentry,(ULong64_t)runlastentry);
-     //
-     prevshift = 0;
-     cout << " ))))) UPDATE RUN INFO (((((  @iev " << iev << " run " << GetRunInfo()->ID << " irun " << irun << endl;
-     //      cout << "runfirstentry "<<runfirstentry<<endl;
-     return (true);
-   };
-   // ----------------------------------------------------
-   // if it is a preselected file (there is SelectionList)
-   // NBNB - the event tree MUST be read first
-   // ----------------------------------------------------
-   if (SELLI == 1) {
-     sel_tree->GetEntry(iev);
-     //      cout << irun << " "<< irunentry << endl;
-     if (irun != oldrun) {
-       run->GetEntry(irun);
-       cout << " ))))) UPDATE RUN INFO (((((  @iev " << iev << " run " << GetRunInfo()->ID << " irun " << irun << endl;
-       prevshift = 0;
-       return true;
-     }
-     return false;
-   }
-   return false;
-   //
- }
- ;
  Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) {
+   if (DBG) printf("PamLevel2::UpdateRunInfo(Long64_t) - inside\n");
    if (!run_tree) {
      cout << " Bool_t PamLevel2::UpdateRunInfo(ULong64_t iev) -- ERROR -- run tree not loaded" << endl;
      return false;
-Line 2881 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
+Line 3966 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
      return (false);
    }
    Int_t oldrun = irun; // store current run index
    // -----------------------------------------------------------------------
-Line 2890 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
+Line 3976 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
    if (irun < 0) {
      irun = 0LL;
      irunt = 0LL;
-     irunentry = 0;
+     totrunentry = 0LL;
+     totrunentrymin = 0LL;
+     totrunentrymax = 0LL;
+     irunentry = 0LL;
+     il0entry = 0LL;
      prevshift = 0;
+     yprevshift = 0;
+     prevabstime = 0;
+     prevpktnum = 0;
+     abstime = 0ULL;
+     pktnum = 0;
+     isFragment = false;
      run_tree->GetEntry(irun);
      if (!GetOrbitalInfo())
        cout << "** WARNING ** missing OrbitalInfo ---> run info might be not correctly updated " << endl;
-     if (gltsync)
+     if ( fUseDBinRunInfo ){
-       delete gltsync; //Emiliano
+       if (gltsync)
-     if (!dbc || (dbc && !dbc->IsConnected()))
+         delete gltsync; //Emiliano
-       SetDBConnection(); //Emiliano
+       if (!dbc || (dbc && !dbc->IsConnected()))
-     gltsync = new GL_TIMESYNC(GetRunInfo()->ID_ROOT_L0, "ID", dbc, false); //Emiliano // the "false" means not to use level0 file (not necessary here)
+         SetDBConnection(); //Emiliano
-     if (dbc){
+       gltsync = new GL_TIMESYNC(GetRunInfo()->ID_ROOT_L0, "ID", dbc, false); //Emiliano // the "false" means not to use level0 file (not necessary here)
-       dbc->Close();// Emiliano
+       if (dbc){
-       delete dbc;
+         dbc->Close();// Emiliano
-       dbc=0;
+         delete dbc;
-     };
+         dbc=0;
-   };
+       }
+     }
+   }
    // ---------------------------------------------------------------
    // retrieve OBT and absolute time of the event
    // ---------------------------------------------------------------
-   ULong64_t abstime = 0LL;
-   //    ULong64_t obt     = 0LL; // Emiliano
    Long64_t obt = 0LL; // Emiliano, Long64_t GL_TIMESYNC::DBobt(UInt_t obt) since depending on the situation OBT is lowered or boosted
+   prevabstime = abstime;
+   prevpktnum = pktnum;
    if (GetOrbitalInfo()) {
      abstime = GetOrbitalInfo()->absTime;
-     obt = gltsync->DBobt(GetOrbitalInfo()->OBT); // Emiliano
+     if ( fUseDBinRunInfo ) obt = gltsync->DBobt(GetOrbitalInfo()->OBT); // Emiliano
+     pktnum = GetOrbitalInfo()->pkt_num; // Emiliano
    }
    else {
      abstime = GetRunInfo()->RUNHEADER_TIME;
-     obt = gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT); // Emiliano
+     if ( fUseDBinRunInfo ) obt = gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT); // Emiliano
+     pktnum = GetRunInfo()->RUNHEADER_PKT; // Emiliano
+   }
+   if (DBG){
+     printf("0abstime %lld %lld pktnum %d %d obt %lld \n",abstime,prevabstime,pktnum,prevpktnum,obt);
+     printf("0        rth %d %d nevents %d  \n",GetRunInfo()->RUNHEADER_TIME,GetRunInfo()->RUNTRAILER_TIME,GetRunInfo()->NEVENTS);
+     printf("0        rto %d %d \n",GetRunInfo()->RUNHEADER_OBT,GetRunInfo()->RUNTRAILER_OBT);
+     if ( fUseDBinRunInfo ) printf("0        rto2 %lld %lld \n",gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT),gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT));
+     printf("0        bo irunentry %lld prevshift %lld irun %lld  \n",irunentry,prevshift,irun);
+     printf("0        min %lld iev %lld max %lld tot %lld \n",totrunentrymin,iev,totrunentrymax,totrunentry);
    }
    // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
-Line 2939 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
+Line 4048 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
      }
      //
-     bool fromfirst = true; // first loop over runs
+     bool a = true;
+     bool b = true;
+     if ( fUseDBinRunInfo ){
+       a = false;
+       b = false;
+       if ( obt < gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT) ) a = true;
+       if ( obt > gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT) ) b = true;
+     }
+     if ( iev < totrunentrymin || iev > totrunentrymax // entry is outside run limits
+          || iev == 0 // or it is the first entry
+          || (!isSync && (
+                          (abstime <= GetRunInfo()->RUNHEADER_TIME && a ) // or it is outside obt limits (and abstime limits for security reasons)
+                          || (abstime >= GetRunInfo()->RUNTRAILER_TIME && b ) ))// or it is outside obt limits (and abstime limits for security reasons)
+          ){ // check on abstime and obt needed to handle nested+DV_skipped packets
+       // check for a new run (ma prima il primo!)
+       if (DBG){
+         printf("1abstime %lld %lld pktnum %d %d obt %lld \n",abstime,prevabstime,pktnum,prevpktnum,obt);
+         printf("1        rth %d %d nevents %d  \n",GetRunInfo()->RUNHEADER_TIME,GetRunInfo()->RUNTRAILER_TIME,GetRunInfo()->NEVENTS);
+         printf("1        rto %d %d \n",GetRunInfo()->RUNHEADER_OBT,GetRunInfo()->RUNTRAILER_OBT);
+         if ( fUseDBinRunInfo ) printf("1        rto2 %lld %lld \n",gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT),gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT));
+         printf("1        bo irunentry %lld prevshift %lld irun %lld  \n",irunentry,prevshift,irun);
+         printf("1        min %lld iev %lld max %lld tot %lld \n",totrunentrymin,iev,totrunentrymax,totrunentry);
+       }
+       //        printf("1abstime %lld %lld pktnum %d %d obt %lld \n",abstime,prevabstime,pktnum,prevpktnum,obt);
+       //        printf("1        rth %d %d nevents %d  \n",GetRunInfo()->RUNHEADER_TIME,GetRunInfo()->RUNTRAILER_TIME,GetRunInfo()->NEVENTS);
+       //        printf("1        rto %d %d \n",GetRunInfo()->RUNHEADER_OBT,GetRunInfo()->RUNTRAILER_OBT);
+       //        printf("1        rto2 %lld %lld \n",gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT),gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT));
+       //        printf("1        bo irunentry %lld prevshift %lld irun %lld  \n",irunentry,prevshift,irun);
+       //        printf("1        min %lld iev %lld max %lld tot %lld \n",totrunentrymin,iev,totrunentrymax,totrunentry);//TOGLITOGLI
-     // ------------------------------------------------------
+       totrunentry = 0LL;
-     // loop over runs to find the one that contains the event
+       runfirstentry = 0LL;
-     // ------------------------------------------------------
+       for (Int_t r=0; r< run_tree->GetEntries();r++){
-     while ((
+         // -------------------------------------------------------------------
-     //          (
+         // save the index of the first entry of the run, relative to pam_tree,
-     //              !(abstime >= GetRunInfo()->RUNHEADER_TIME &&    // check on absolute time (s)
+         // and read a new run
-     //                abstime <= GetRunInfo()->RUNTRAILER_TIME) &&
+         // -------------------------------------------------------------------
-     //              !(obt >= GetRunInfo()->RUNHEADER_OBT &&         // additional check on OBT (ms)
+         run_tree->GetEntry(r);//update runinfo
-     //                obt <= GetRunInfo()->RUNTRAILER_OBT)
+         if ( r > 0 ){
-     //              )
+           totrunentrymin = totrunentrymax+1;
+         } else {
-     !(abstime >= GetRunInfo()->RUNHEADER_TIME && // check on absolute time (s)
+           totrunentrymin = 0LL;
-         abstime <= GetRunInfo()->RUNTRAILER_TIME) || !(obt >= gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT) && // additional check on OBT (ms) // Emiliano
+         }
-         obt <= gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT)) // Emiliano
+         totrunentry += GetRunInfo()->NEVENTS;
-         || GetRunInfo()->NEVENTS == 0
+         totrunentrymax = totrunentry - 1 - prevshift; // prevshift is needed to handle nested+DV_skipped packets
-     //          || !(irunentry < GetRunInfo()->NEVENTS-1-prevshift) // ERRORE!!! fa saltare i run con 1 evento
+         irun = r;
-         || !(irunentry <= GetRunInfo()->NEVENTS - 1 - prevshift)) && irun < run_tree->GetEntries()) {
+         if ( fUseDBinRunInfo ){
+           a = false;
-       //            if( !(abstime >= GetRunInfo()->RUNHEADER_TIME &&abstime <= GetRunInfo()->RUNTRAILER_TIME)  )cout << "ABS TIME "<<abstime << " " <<GetRunInfo()->RUNTRAILER_TIME <<endl;
+           b = false;
-       //            if( !(obt >= GetRunInfo()->RUNHEADER_OBT && obt <= GetRunInfo()->RUNTRAILER_OBT) )cout << "OBT TIME "<< obt <<" "<< GetRunInfo()->RUNTRAILER_OBT << endl;
+           if ( obt < gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT) ) a = true;
-       //            if( GetRunInfo()->NEVENTS==0  )cout <<"GetRunInfo()->NEVENTS==0 "<<endl;
+           if ( obt > gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT) ) b = true;
-       //            if( !(irunentry <= GetRunInfo()->NEVENTS-1-prevshift) ) cout << "irunentry > "<<GetRunInfo()->NEVENTS-1-prevshift << endl;
+         }
-       // - - - - - - - - - - - - -
+         if ( (iev >= totrunentrymin && iev <= totrunentrymax) || // entry is inside run limits
-       // irunentry = position of current entry, relative to the run
+              ( !isSync &&
-       // prevshift = shift needed to synchronize l0 and l2 data (nested events)
+                ( abstime >= GetRunInfo()->RUNHEADER_TIME  && a // or it is inside obt limits (and abstime limits for security reasons)
-       // - - - - - - - - - - - - -
+                  && abstime <= GetRunInfo()->RUNTRAILER_TIME && b))  // or it is inside obt limits (and abstime limits for security reasons)
+              ){ // check on abstime and obt needed to handle nested+DV_skipped packets
-       // -----------------------------------------
+           if ( totrunentrymin > iev ){ // there is a shift (nested+DV_skipped packets)
-       // store dead and live-time of previous run
+             if ( !isSync ){
-       // -----------------------------------------
+               if (DBG) printf("PamLevel2::UpdateRunInfo(Long64_t) - unconsistent iev - nevents, probable DBL0-L2 async\n");
-       //            if(SELLI==0){
+               if (DBG) printf("PamLevel2::UpdateRunInfo(Long64_t) - totrunentrymin %lld iev %lld prevshift %lld totrunentrymax %lld \n",totrunentrymin,iev,prevshift,totrunentrymax);
-       if (SELLI != 2) {
+               //              printf("PamLevel2::UpdateRunInfo(Long64_t) - unconsistent iev - nevents, probable DBL0-L2 async\n");
-         if (fromfirst) {
+               //              printf("PamLevel2::UpdateRunInfo(Long64_t) - totrunentrymin %lld iev %lld prevshift %lld totrunentrymax %lld \n",totrunentrymin,iev,prevshift,totrunentrymax);//TOGLITOGLI
-           if (oldrun == irun) {
+               prevshift += (totrunentrymin-iev); // add the new shift to total shift
-             /// decrement counters
+               totrunentrymin -= (totrunentrymin-iev); // shift run position min
-             if (GetTrigLevel2()) {
+               totrunentrymax -= (totrunentrymin-iev); // shift run position max
-               totdltime[0] -= GetTrigLevel2()->dltime[0];//live-time
+               if (DBG) printf("PamLevel2::UpdateRunInfo(Long64_t) - totrunentrymin %lld iev %lld prevshift %lld totrunentrymax %lld \n",totrunentrymin,iev,prevshift,totrunentrymax);
-               totdltime[1] -= GetTrigLevel2()->dltime[1];//dead-time
+               //              printf("PamLevel2::UpdateRunInfo(Long64_t) - totrunentrymin %lld iev %lld prevshift %lld totrunentrymax %lld \n",totrunentrymin,iev,prevshift,totrunentrymax);//TOGLITOGLI
-             }
+             } else {
-             totdltime[2]--; //event counter
+               printf(" PamLevel2::UpdateRunInfo(Long64_t) ERROR! sync file but unconsistent totrunetrymin %lld and iev %lld!!! \n",totrunentrymin,iev);
-             if (DBG) {
+               cout << " OK this is a bug, write to Emiliano, Emiliano.Mocchiutti@ts.infn.it " << endl;
-               cout << endl;
+               cout << "\nFor bug reporting instructions, please see for example:\n";
-               cout << "n.events     : " << totdltime[2] << endl;
+               cout << "     <http://www.ts.infn.it/~mocchiut/bugs/bugs.html>.\n";
-               cout << "RUN LIVE-TIME: " << totdltime[0] * 0.16 << " ms" << endl;
+               cout << "  " << endl;
-               cout << "RUN DEAD-TIME: " << totdltime[1] * 0.01 << " ms" << endl;
              }
            }
-           else {
+           runfirstentry = totrunentrymin; // first entry of the run in the level2
-             totdltime[0] = 0;//live-time
-             totdltime[1] = 0;//dead-time
-             totdltime[2] = 0; //event counter
+           //
-             if (DBG)
+           if ( fUseDBinRunInfo ){
-               cout << " *** JUMP RUN *** irun " << irun << endl;
+             if (gltsync)
+               delete gltsync; // Emiliano
+             if (!dbc || (dbc && !dbc->IsConnected()))
+               SetDBConnection(); //Emiliano
+             gltsync = new GL_TIMESYNC(GetRunInfo()->ID_ROOT_L0, "ID", dbc, false); // Emiliano
+             TrkParams::Set(GetRunInfo(), dbc);
+             if (dbc){
+               dbc->Close(); // Emiliano
+               delete dbc;
+               dbc=0;
+             }
+             if (gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT) > gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT)) { // Emiliano
+               cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- WARNING -- irun " << irun
+                    << "  has RUNHEADER_OBT>=RUNTRAILER_OBT " << endl;
+               cout
+                 << "                                                            (NB!! in this case some events could be assigned to a wrong run)"
+                 << endl;
+             }
            }
-           /// add an entry
+           //
-           if (run_tree_clone)
+           if (DBG) printf(" found \n");
-             if (run_tree_clone->GetBranch("DeadLiveTime")->GetEntries() < run_tree->GetEntries())
+           //          printf(" found \n");//TOGLITOGLI
-               run_tree_clone->GetBranch("DeadLiveTime")->Fill();
+           //
-           /// reset counters
+           break;
+         }
+       } // loop over run
+       // --------------------------------------
+       // if there was no need to update the run
+       // ---> exit with FALSE
+       // --------------------------------------
+       if (irun == oldrun){
+         if (DBG) printf(" no new run \n");
+         //        printf(" no new run \n");//TOGLITOGLI
+         return (false);
+       }
+       // --------------------------------------
+       // ... otherwise
+       // ---> exit with TRUE
+       // --------------------------------------
+       if (SELLI != 2) {
+         /// decrement counters since this event belongs to a new run
+         if (GetTrigLevel2()) {
+           totdltime[0] -= GetTrigLevel2()->dltime[0];//live-time
+           totdltime[1] -= GetTrigLevel2()->dltime[1];//dead-time
+         }
+         totdltime[2]--; //event counter
+         if (DBG) {
+           cout << endl;
+           cout << "n.events     : " << totdltime[2] << endl;
+           cout << "RUN LIVE-TIME: " << totdltime[0] * 0.16 << " ms" << endl;
+           cout << "RUN DEAD-TIME: " << totdltime[1] * 0.01 << " ms" << endl;
+         }
+         // add an entry
+         if (run_tree_clone && totdltime[2] > 0)
+           if (run_tree_clone->GetBranch("DeadLiveTime")->GetEntries() < run_tree->GetEntries())
+             run_tree_clone->GetBranch("DeadLiveTime")->Fill();
+         // reset counters
+         if ( totdltime[2] > 0 ){
            if (GetTrigLevel2()) {
              totdltime[0] = GetTrigLevel2()->dltime[0];//live-time
              totdltime[1] = 0; //dead-time
-Line 3008 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
+Line 4197 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
            totdltime[2] = 1; //event counter
          }
        }
-       //            }
-       irun++;
+       if (DBG){
-       // ------------------------------------
+         cout << endl << " ))))) UPDATE RUN INFO (((((  @iev " << iev << " run " << GetRunInfo()->ID << " irun " << irun
-       // if the end of run tree is reached...
+              << endl;
-       // ------------------------------------
+         printf("2abstime %lld %lld pktnum %d %d obt %lld \n",abstime,prevabstime,pktnum,prevpktnum,obt);
-       if (irun == run_tree->GetEntries()) {
+         printf("2        rth %d %d nevents %d  \n",GetRunInfo()->RUNHEADER_TIME,GetRunInfo()->RUNTRAILER_TIME,GetRunInfo()->NEVENTS);
-         if (!fromfirst) {
+         printf("2        rto %d %d \n",GetRunInfo()->RUNHEADER_OBT,GetRunInfo()->RUNTRAILER_OBT);
-           // -----------------------------------------------------
+         if ( fUseDBinRunInfo ) printf("2        rto2 %lld %lld \n",gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT),gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT));
-           // if it happened already once and the run was not found
+         printf("2        bo irunentry %lld prevshift %lld irun %lld  \n",irunentry,prevshift,irun);
-           // ---> exit with error
+         printf("2        min %lld iev %lld max %lld tot %lld \n",totrunentrymin,iev,totrunentrymax,totrunentry);
-           // -----------------------------------------------------
-           cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- ERROR -- event entry #" << iev
-               << " does not belong to any run (should not happen)" << endl;
-           return false;
-         }
-         // -----------------------------------------
-         // ...otherwise repeat search from beginning
-         // -----------------------------------------
-         cout
-             << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- WARNING -- reached end of run tree. searchin again from beginning "
-             << endl;
-         fromfirst = false;
-         irun = 0LL;
-         runfirstentry = 0LL;
        }
-       // -------------------------------------------------------------------
+       //        printf("2abstime %lld %lld pktnum %d %d obt %lld \n",abstime,prevabstime,pktnum,prevpktnum,obt);
-       // save the index of the first entry of the run, relative to pam_tree,
+       //        printf("2        rth %d %d nevents %d  \n",GetRunInfo()->RUNHEADER_TIME,GetRunInfo()->RUNTRAILER_TIME,GetRunInfo()->NEVENTS);
-       // and read a new run
+       //        printf("2        rto %d %d \n",GetRunInfo()->RUNHEADER_OBT,GetRunInfo()->RUNTRAILER_OBT);
-       // -------------------------------------------------------------------
+       //        printf("2        rto2 %lld %lld \n",gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT),gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT));
-       if (irun > 0)
+       //        printf("2        bo irunentry %lld prevshift %lld irun %lld  \n",irunentry,prevshift,irun);
-         runfirstentry += (GetRunInfo()->NEVENTS) - prevshift;
+       //        printf("2        min %lld iev %lld max %lld tot %lld \n",totrunentrymin,iev,totrunentrymax,totrunentry);//TOGLITOGLI
-       irunentry = 0;
-       prevshift = 0;
+       return (true);
-       run_tree->GetEntry(irun);//update runinfo
+     } // need for run upgrade
-       irunt = irun - irunoffset[run_tree->GetTreeNumber()];
+     if (DBG) printf("return false\n");
-       if (gltsync)
+     return (false);
-         delete gltsync; // Emiliano
+   }// SELLI = 0 SELLI = 2
-       if (!dbc || (dbc && !dbc->IsConnected()))
-         SetDBConnection(); //Emiliano
-       gltsync = new GL_TIMESYNC(GetRunInfo()->ID_ROOT_L0, "ID", dbc, false); // Emiliano
-       if (dbc){
-         dbc->Close(); // Emiliano
-         delete dbc;
-         dbc=0;
-       };
-       if (gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT) > gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT)) { // Emiliano
-         cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- WARNING -- irun " << irun
-             << "  has RUNHEADER_OBT>=RUNTRAILER_OBT " << endl;
-         cout
-             << "                                                            (NB!! in this case some events are assigned to a wrong run)"
-             << endl;
-       }
-       //            if(hasfrag &&  fragid != GetRunInfo()->ID){
-       //                cout << "... where is the next fragment ??"<<endl;
-       //            }
-     };
-     // --------------------------------------
-     // if there was no need to update the run
-     // ---> exit with FALSE
-     // --------------------------------------
-     if (irun == oldrun)
-       return (false);
-     // --------------------------------------
-     // ... otherwise
-     // --------------------------------------
-     // --------------------------------------
-     // ---> exit with TRUE
-     // --------------------------------------
-     if (DBG)
-       cout << endl << " ))))) UPDATE RUN INFO (((((  @iev " << iev << " run " << GetRunInfo()->ID << " irun " << irun
-           << endl;
-     // ----------------------------------------------------
-     // update the tracker parameters
-     // (non ho trovato nessun altro modo sicuro di farlo...)
-     // ----------------------------------------------------
-     if (!dbc || (dbc && !dbc->IsConnected()))
-       SetDBConnection();
-     TrkParams::Set(GetRunInfo(), dbc);
-     if (dbc){
-       dbc->Close();
-       delete dbc;
-       dbc=0;
-     };
-     // ----------------------------------------------------
-     // then check if the run has a fragment
-     // in this case we have to switch to the next fragment
-     // when the end of the first fragment is reached
-     // ----------------------------------------------------
-     if (GetRunInfo()->ID_RUN_FRAG != 0 &&
-     //      GetRunInfo()->ID_RUN_FRAG != GetRunInfo()->ID &&
-         DBG && true) {
-       cout << "* fragment *" << endl;
-     }
-     return (true);
-   };
    // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
    // if it is a preselected file (there is SelectionList)
    // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
-Line 3184 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
+Line 4295 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
        // update the tracker parameters
        // (non ho trovato nessun altro modo sicuro di farlo...)
        // ----------------------------------------------------
-       if (!dbc || (dbc && !dbc->IsConnected()))
+       if ( fUseDBinRunInfo ){
-         SetDBConnection();
+         if (!dbc || (dbc && !dbc->IsConnected()))
-       TrkParams::Set(GetRunInfo(), dbc);
+           SetDBConnection();
-       if (dbc){
+         TrkParams::Set(GetRunInfo(), dbc);
-         dbc->Close();
+         if (dbc){
-         delete dbc;
+           dbc->Close();
-         dbc=0;
+           delete dbc;
-       };
+           dbc=0;
+         }
+       }
        //            cout << endl;
        prevshift = 0;
+       yprevshift = 0;
        return true;
      }
      return false;
-Line 3202 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
+Line 4316 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
    return false;
    //
  }
- ;
+ /**
+  * Update the runinfo informations (to be used to have Run infos event by event basis)
+  * @param run Pointer to the chain/tree which contains run infos
+  * @return true if a new run has been read, false if it is still the same run
+  */
+ Bool_t PamLevel2::UpdateRunInfo(TChain *run, Long64_t iev) {
+   return (UpdateRunInfo(iev));
+ }
  /**
   * Update the runinfo informations (to be used to have Run infos event by event basis)
   * @param run Pointer to the chain/tree which contains run infos
-Line 3211 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
+Line 4334 
 Bool_t PamLevel2::UpdateRunInfo(Long64_t
  Bool_t PamLevel2::UpdateRunInfo(TTree *run, Long64_t iev) {
    return (UpdateRunInfo((TChain*) run, iev));
  }
- ;
  //--------------------------------------
  //
-Line 3449 
 void PamLevel2::GetWhichTrees(TFile* f)
+Line 4572 
 void PamLevel2::GetWhichTrees(TFile* f)
    //    cout << "Checking file: "<<f->GetName()<<endl;
    if (!f || f->IsZombie()) {
      cout << "File: " << f->GetName() << " Non valid root file" << endl;
+     fDiscarded = true;
      return;
    }
-Line 3655 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4779 
 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 3693 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4818 
 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 3707 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4833 
 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 3720 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4847 
 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 3733 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4861 
 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 3747 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4876 
 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 3760 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4890 
 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 3773 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4904 
 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 3786 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4918 
 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 3809 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4942 
 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 3831 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4965 
 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 3843 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 4978 
 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 3885 
 Bool_t PamLevel2::CheckLevel2File(TStrin
+Line 5022 
 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 4042 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5191 
 void PamLevel2::CreateCloneTrees(TFile *
      //    sel_tree_clone->Branch("RunEntry",&irun,"runentry/L");
      sel_tree_clone->Branch("RunEntry", &irunt, "runentry/L");//NEWNEW
      sel_tree_clone->Branch("EventEntry", &irunentry, "eventry/L");
+     //    if ( hasL0EE ) sel_tree_clone->Branch("L0EventEntry", &il0entry, "l0eventry/L");
    };
    Int_t i = 0;
-Line 4061 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5211 
 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 4075 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5239 
 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 4083 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5259 
 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 4118 
 void PamLevel2::CreateCloneTrees(TFile *
+Line 5306 
 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
    if (GP) {
      pam_tree_clone[i] = new TTree("h20", "GPAMELA info ");
      pam_tree_clone[i]->Branch("GPamela", "GPamela", GetPointerTo("GPamela"), 32000, 1);//split
-     cout << "OrbitalInfo  : branch OrbitalInfo" << endl;
+     cout << "GPamela  : branch GPamela" << endl;
      i++;
    };
    cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" << endl;
  }
-Line 4187 
 void PamLevel2::WriteCloneTrees() {
+Line 5389 
 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 4197 
 void PamLevel2::WriteCloneTrees() {
+Line 5399 
 void PamLevel2::WriteCloneTrees() {
  /**
   * Method to get level2-trees entry, the corresponding run entry and (if required) the level0 entry.
   */
- //Int_t PamLevel2::GetEntry(Int_t iee){
  Int_t PamLevel2::GetEntry(Long64_t iee) {
-   //     cout << "-------------------------------------"<<endl;
-   //     cout << "Int_t PamLevel2::GetEntry("<<iee<<")"<<endl;
    if (!pam_tree) {
      cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- level2 trees not loaded" << endl;
      return 0;
-Line 4216 
 Int_t PamLevel2::GetEntry(Long64_t iee)
+Line 5414 
 Int_t PamLevel2::GetEntry(Long64_t iee)
    //    return 0;
    //    }
-   Long64_t ii = 0;
    //-------------------------------
-   ii = iee;
+   if (!pam_tree->GetEntry(iee)) {
-   if (!pam_tree->GetEntry(ii)) {
      cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- error reading pam tree" << endl;
      return 0;
    }
-Line 4239 
 Int_t PamLevel2::GetEntry(Long64_t iee)
+Line 5435 
 Int_t PamLevel2::GetEntry(Long64_t iee)
    }
    //-------------------------------
-   ii = iee;
+   //
-   //    Bool_t UPDATED = UpdateRunInfo(run_tree,ii);
+   if ( fUpdateRunInfo ) UpdateRunInfo(iee); // Emiliano
-   //    Bool_t UPDATED = UpdateRunInfo(ii);
+   if (SELLI == 0 || SELLI == 2) irunentry = iee - runfirstentry;
-   if ( fUpdateRunInfo ) UpdateRunInfo(ii); // Emiliano
-   if (SELLI == 0 || SELLI == 2)
-     irunentry = iee - runfirstentry;
-   //    if(UPDATED && run_tree_clone)run_tree_clone->Fill();
-   //    cout << "PamLevel2::GetEntry("<<iee<<") "<<irun<<" "<<runfirstentry<<" "<<irunentry<<endl;
-   //     cout << "irunentry     "<<irunentry << endl;
-   //     cout << "runfirstentry "<<runfirstentry << endl;
-   //     cout << "nevents       "<<GetRunInfo()->NEVENTS<< endl;
-   //     if( TRK0 || CAL0 || TOF0 ){
-   //    if( !GetYodaEntry( ) ){
-   //        cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- error reading level0 tree"<<endl;
-   //        return 0;
-   //    }
-   //     }
    return 1;
-Line 4300 
 TTree* PamLevel2::GetYodaTree() {
+Line 5478 
 TTree* PamLevel2::GetYodaTree() {
    //===================================
    if (irun < 0) {
      cout << "PamLevel2::GetYodaTree() -- ERROR -- irun = " << irun << endl;
-     //  cout << "In order to use this method you have to first load the RunInfo tree "<<endl;
+     if (DBG) cout << "In order to use this method you have to first load the RunInfo tree "<<endl;
      return NULL;
    }
-   Int_t irootnew = run_obj->ID_ROOT_L0;
+   Int_t irootnew = GetRunInfo()->ID_ROOT_L0;
-   //      cout << "iroot    "<<iroot<<endl;
+   if (DBG){
-   //      cout << "irootnew "<<irootnew<<endl;
+     cout << "iroot    "<<iroot<<endl;
+     cout << "irootnew "<<irootnew<<endl;
+   }
    //===================================
    // load the level0 file
-Line 4343 
 TTree* PamLevel2::GetYodaTree() {
+Line 5523 
 TTree* PamLevel2::GetYodaTree() {
      if (!h0_obj)
        h0_obj = new EventHeader();
      l0_tree->SetBranchAddress("Header", &h0_obj);
-     prevshift = 0;
+     yprevshift = 0; // yes, yprevshift is the shift in the level0, prevshift is the shift in the level2
      //---------------------------------------------------
      // TRACKER:
      if (TRK0) {
-Line 4361 
 TTree* PamLevel2::GetYodaTree() {
+Line 5541 
 TTree* PamLevel2::GetYodaTree() {
          calo0_obj->Set();
        };
        l0_tree->SetBranchAddress("Calorimeter", calo0_obj->GetPointerToCalorimeterEvent());
-       //            cout << "PamLevel2::GetYodaTree() --- level0 calorimeter not implemented "<<endl;
      }
      //---------------------------------------------------
      // TOF:
-Line 4375 
 TTree* PamLevel2::GetYodaTree() {
+Line 5554 
 TTree* PamLevel2::GetYodaTree() {
    };
-   //     if(!dbc || (dbc && !dbc->IsConnected())){
-   //    cout << " TTree* PamLevel2::GetYodaTree( ) -- no DB connected... hai fatto qualche cazzata "<<endl;
-   //     }
    if (TRK0) {
-     //  TrkParams::Load(6);
+     if(!dbc || (dbc && !dbc->IsConnected()))SetDBConnection();
-     //  if( !TrkParams::IsLoaded(6) ){
-     //      cout << " TTree* PamLevel2::GetYodaTree( ) -- WARNING -- VK-mask not loaded"<<endl;
-     //  };
-     if(!dbc || (dbc && !dbc->IsConnected()))SetDBConnection(); // PERCHE` ERA COMMENTATA QUESTA RIGA?
      TrkParams::SetCalib(run_obj, dbc);
      TrkParams::LoadCalib();
      if (!TrkParams::CalibIsLoaded()) {
-Line 4396 
 TTree* PamLevel2::GetYodaTree() {
+Line 5567 
 TTree* PamLevel2::GetYodaTree() {
        dbc=0;
      };
    }
-   //    cout << l0_tree << endl;
    return l0_tree;
  }
  /**
-Line 4407 
 TTree* PamLevel2::GetYodaTree() {
+Line 5575 
 TTree* PamLevel2::GetYodaTree() {
   */
  Int_t PamLevel2::GetYodaEntry() {
-   //    cout << "Int_t PamLevel2::GetYodaEntry()"<<endl;
+   Long64_t iev = this->GetReadEntry();
-   if (!GetYodaTree())
-     return 0;
-   // patch
+   // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
-   if (irunentry < 0) {
+   // if it is a full file (not preselected)
-     //  cout << "Int_t PamLevel2::GetYodaEntry() -- ATTENZIONE -- irunentry negativo?!?! "<<(Int_t)irunentry<<endl;
+   // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
-     irunentry = 0LL;
+   //  if (SELLI == 0 || SELLI == 2 || !hasL0EE) {
-   }
-   //  ---------------------------------
-   //  if file is NOT a preselected file
-   //  ---------------------------------
-   Long64_t quellagiusta = irunentry + (Long64_t)(run_obj->EV_FROM);
-   //     cout << " irunentry "<<irunentry<<endl;
-   //     cout << " EV_FROM "<<run_obj->EV_FROM<<endl;
-   //     cout << " quellagiusta = irunentry + EV_FROM "<< quellagiusta << endl;
-   //     cout << " irun "<< irun << " irunentry "<< irunentry<<" run_obj->EV_FROM "<<run_obj->EV_FROM <<" quella giusta "<<quellagiusta << endl;
-   //     cout << " iroot "<<iroot<<" run_obj->ID_ROOT_L0 "<<run_obj->ID_ROOT_L0<<endl;
-   //     cout << " time "<< abstime << endl;
-   //     cout << " trk_calib_used "<<run_obj->TRK_CALIB_USED<< endl;
-   ULong64_t obt = 0;
+     if (!GetYodaTree()){
-   ULong64_t pktn = 0;
+       printf(" PamLevel2::GetYodaEntry() : ERROR no level0 file loaded!\n");
-   if (GetOrbitalInfo()) {
+       return 0;
-     obt = GetOrbitalInfo()->OBT;
+     }
-     pktn = GetOrbitalInfo()->pkt_num;
-   }
-   if (!GetOrbitalInfo() && !ISGP) {
+     if (irunentry < 0) {
-     cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- missing OrbitalInfo " << endl;
+       if (DBG) cout << "Int_t PamLevel2::GetYodaEntry() -- ATTENZIONE -- irunentry negativo?!?! "<<(Int_t)irunentry<<endl;
-     return 0;
+       //      cout << "Int_t PamLevel2::GetYodaEntry() -- ATTENZIONE -- irunentry negativo?!?! "<<(Int_t)irunentry<<endl; // TOGLITOGLI
-   }
+       irunentry = 0LL;
-   if (obt == 0 && pktn == 0 && !ISGP) {
+     }
-     cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- level2 event corrupted ?? " << endl;
+     //  ---------------------------------
-     return 0;
+     //  if file is NOT a preselected file
-   }
+     //  ---------------------------------
+     Long64_t quellagiusta = irunentry + (Long64_t)(run_obj->EV_FROM); // prevshift already included in irunentry
+     if (DBG){
+       cout << " irun "<< irun << " irunentry "<< irunentry<<" run_obj->EV_FROM "<<run_obj->EV_FROM <<" quella giusta "<<quellagiusta << endl;
+       cout << " iroot "<<iroot<<" run_obj->ID_ROOT_L0 "<<run_obj->ID_ROOT_L0<<endl;
+       cout << " time "<< abstime << endl;
+     }
+     ULong64_t obt = 0;
+     ULong64_t pktn = 0;
+     if (GetOrbitalInfo()) {
+       obt = GetOrbitalInfo()->OBT;
+       pktn = GetOrbitalInfo()->pkt_num;
+     }
-   // ---------------------------------------------------------------------
+     if (!GetOrbitalInfo() && !ISGP) {
-   // ATTENTION!!!
+       cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- missing OrbitalInfo " << endl;
-   // If data are not pre-processed with cleaner, the level0 tree may contain
+       return 0;
-   // spurious nested physics packets.
-   // The GL_RUN variables EV_FROM, EV_TO and NEVENTS counts also these entries
-   // while level2 tree DOES NOT!!
-   // This means that "quellagiusta" in these cases is not correct.
-   // In order to retrieve the correct level0 event, I implemented a check
-   // of the OBT and pkt-number. In case of mismatch, the level0 entry number
-   // is shift forward until when the packets match.
-   // ---------------------------------------------------------------------
-   Int_t answer = 0;
-   Int_t shift = 0;
-   //    printf(" siamo qui %i %i \n",shift,prevshift);
-   //    Int_t maxshift = 50; // EMILIANO
-   do {
-     if (shift > 0) {
-       cout << " PKTNUM  L2 --- " << pktn << " --- L0 --- " << GetEventHeader()->GetPscuHeader()->GetCounter() << endl;
-       if (DBG)
-         cout << "         RUN: ID " << GetRunInfo()->ID << " ID_ROOT_L0 " << run_obj->ID_ROOT_L0 << " ID_RUN_FRAG "
-             << GetRunInfo()->ID_RUN_FRAG << " EV_FROM " << GetRunInfo()->EV_FROM << endl;
-       if (DBG)
-         cout << "         L2 <--> L0 mismatch ( irun " << irun << " irunentry " << irunentry << " shift " << shift
-             << " prevshift " << prevshift << " )" << endl;
      }
-     answer = l0_tree->GetEntry(quellagiusta + (Long64_t) shift + (Long64_t) prevshift);
+     if (obt == 0 && pktn == 0 && !ISGP) {
-     shift++;
+       cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- level2 event corrupted ?? " << endl;
-     if (!GetEventHeader()) {
-       cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- missing EventHeader " << endl;
        return 0;
      }
+     // ---------------------------------------------------------------------
+     // ATTENTION!!!
+     // If data are not pre-processed with cleaner, the level0 tree may contain
+     // spurious nested physics packets.
+     // The GL_RUN variables EV_FROM, EV_TO and NEVENTS counts also these entries
+     // while level2 tree DOES NOT!!
+     // This means that "quellagiusta" in these cases is not correct.
+     // In order to retrieve the correct level0 event, I implemented a check
+     // of the OBT and pkt-number. In case of mismatch, the level0 entry number
+     // is shift forward until when the packets match.
+     // ---------------------------------------------------------------------
+     Long64_t shift = 0LL;
+     Long64_t answer = quellagiusta + shift + yprevshift;
+     Int_t readl0 = 0;
+     readl0 = l0_tree->GetEntry(answer); // prevshift already included in irunentry
+     if (DBG){
+       printf(" siamo qui shift %lld yprevshift %lld answer %lld \n",shift,yprevshift,answer);
+     }
      if (ISGP) {
        obt = (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()); //BARBATRUCCO
        pktn = (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter()); //BARBATRUCCO
      }
-     //  cout << "PKTNUM "<<shift<<" ==  L2 --- "<< pktn << " --- L0 --- "<< GetEventHeader()->GetPscuHeader()->GetCounter()<<endl;
+     while ( (obt != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()) || pktn != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter())) && (quellagiusta + (Long64_t) shift) < GetYodaTree()->GetEntries() && shift < maxshift ){
-     //  cout << " L2 --- "<< obt << " --- L0 --- "<< GetEventHeader()->GetPscuHeader()->GetOrbitalTime()<<endl;
+       if ( isSync && shift == 0LL ){
-     //  if( (quellagiusta+shift) == l0_tree->GetEntries()+1 )cout << ">>> end of level0 tree <<<"<<endl;
+         printf(" PamLevel2::GetYodaEntry() ERROR! sync file but the level0 entry not found in place!!! \n");
-     //  cout << " obt "<< obt << endl;
+         cout << " OK this is a bug, write to Emiliano, Emiliano.Mocchiutti@ts.infn.it " << endl;
-     //  cout << " GetEventHeader()->GetPscuHeader()->GetOrbitalTime() "<< GetEventHeader()->GetPscuHeader()->GetOrbitalTime() << endl;
+         cout << "\nFor bug reporting instructions, please see for example:\n";
-     //  cout << " pktn "<< pktn << endl;
+         cout << "     <http://www.ts.infn.it/~mocchiut/bugs/bugs.html>.\n";
-     //  cout << " GetEventHeader()->GetPscuHeader()->GetCounter() "<< GetEventHeader()->GetPscuHeader()->GetCounter() << endl;
+         cout << "  " << endl;
-     //  printf(" IDRUN %u \n",GetRunInfo()->ID);
+       }
-     //
+       if (shift > 0) {
-     if (prevshift != 0 && (quellagiusta + (Long64_t) shift) == GetYodaTree()->GetEntries()) {
+         if (DBG) cout << " PKTNUM  L2 --- " << pktn << " --- L0 --- " << GetEventHeader()->GetPscuHeader()->GetCounter() << endl;
-       prevshift = 0;
+         if (DBG)
-       shift = -1;
+           cout << "         RUN: ID " << GetRunInfo()->ID << " ID_ROOT_L0 " << run_obj->ID_ROOT_L0 << " ID_RUN_FRAG "
-     };
+                << GetRunInfo()->ID_RUN_FRAG << " EV_FROM " << GetRunInfo()->EV_FROM << endl;
+         if (DBG)
+           cout << "         L2 <--> L0 mismatch ( irun " << irun << " irunentry " << irunentry << " shift " << shift
+                << " prevshift " << prevshift << " )" << endl;
+       }
+       answer = quellagiusta +  shift+ yprevshift;
+       readl0 = l0_tree->GetEntry(answer);
+       //      printf(" inside while shift %lld yprevshift %lld answer %lld \n",shift,yprevshift,answer);//TOGLITOGLI
-   } while ((obt != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()) || pktn != (UInt_t)(
+       if (!GetEventHeader()) {
-       GetEventHeader()->GetPscuHeader()->GetCounter())) && (quellagiusta + (Long64_t) shift)
+         cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- missing EventHeader " << endl;
-       < GetYodaTree()->GetEntries() && shift < maxshift);
+         return 0;
+       }
-   if ((quellagiusta + (Long64_t) shift + (Long64_t) prevshift) > GetYodaTree()->GetEntries() || shift == maxshift) {
+       //
-     cout << " Big trouble here, no such event in Level0 data! (NB maxshift set to " << maxshift << " )" << endl;
+       if (yprevshift != 0 && (quellagiusta + (Long64_t) shift) == GetYodaTree()->GetEntries()) {
-     return 0;
+         if (DBG) printf(" reset inside while shift %lld yprevshift %lld answer %lld \n",shift,yprevshift,answer);
-   }
+         //        printf(" reset inside while shift %lld yprevshift %lld answer %lld \n",shift,yprevshift,answer);//TOGLITOGLI
-   //    cout << "LA ENTRY GIUSTA E`: "<<quellagiusta<<" (spero...)"<<endl;
+         yprevshift = 0LL;
-   //    return GetYodaTree()->GetEntry(quellagiusta);
+         shift = -1LL;
-   if (shift > 1)
+       };
-     prevshift += (shift - 1);
+       shift++;
+     }
-   return answer;
+     if ( obt != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()) || pktn != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter()) ){
+       if ( isSync ){
+         printf(" PamLevel2::GetYodaEntry() ERROR! sync file but the level0 entry not found AT ALL!!! \n");
+         cout << " OK this is a bug, write to Emiliano, Emiliano.Mocchiutti@ts.infn.it " << endl;
+         cout << "\nFor bug reporting instructions, please see for example:\n";
+         cout << "     <http://www.ts.infn.it/~mocchiut/bugs/bugs.html>.\n";
+         cout << "  " << endl;
+       }
+       cout << "Int_t PamLevel2::GetYodaEntry() -- WARNING -- " << endl;
+       cout << " Big trouble here, no such event in Level0 data! (NB maxshift set to " << maxshift << " )" << endl;
+       cout << " Nested and/or DarthVader skipped packets in fragmented run? checking and trying to fix " <<endl;
+       // query the DB for runs containing the event, loop over LEVEL0 files which could contain the level0 event and try to find it
+       // ma nel mezzo del cammin per ogni run che pesco devo vedere la posizione relativa di iev rispetto al runheader nel livello2 per andare a cercare nel posto giusto
+       // connect to db
+       if (!dbc || (dbc && !dbc->IsConnected())) SetDBConnection(); //Emiliano
+       //
+       if (GetOrbitalInfo()){
+         abstime = GetOrbitalInfo()->absTime;
+       } else {
+         printf(" PamLevel2::GetYodaEntry() ERROR! no OrbitalInfo, cannot get the absolute time for event \n");
+         return 0;
+       }
+       // query DB looking for runs containing the processed event
+       TSQLResult *pResult;
+       TSQLRow *Row = NULL;
+       TString myquery = Form("select ID,NEVENTS from GL_RUN where RUNHEADER_TIME<=%lld and RUNTRAILER_TIME>=%lld;",abstime,abstime);
+       if ( DBG ) printf(" query is %s \n",myquery.Data());
+       //      printf(" query is %s \n",myquery.Data());// TOGLITOGLI
+       pResult = dbc->Query(myquery.Data());
+       if (!pResult->GetRowCount()){
+         printf(" PamLevel2::GetYodaEntry() ERROR! event is not included in any run!!! \n");
+         cout << " OK this is a bug, write to Emiliano, Emiliano.Mocchiutti@ts.infn.it " << endl;
+         cout << "\nFor bug reporting instructions, please see for example:\n";
+         cout << "     <http://www.ts.infn.it/~mocchiut/bugs/bugs.html>.\n";
+         cout << "  " << endl;
+         return 0;
+       }
+       if ( pResult->GetRowCount() == 1 ){
+         if (DBG) printf(" PamLevel2::GetYodaEntry() - WARNING - YodaEntry not found but only one run containing the event, it should not happen \n");
+         //        printf(" PamLevel2::GetYodaEntry() - WARNING - YodaEntry not found but only one run containing the event, it should not happen \n");//TOGLITOGLI
+       }
+       for( Int_t ru=0; ru < pResult->GetRowCount(); ru++){ // loop over runs containing the event
+         if (Row) delete Row;
+         Row = pResult->Next();
+         if( Row == NULL ) break;
+         UInt_t idrun = (UInt_t)atoll(Row->GetField(0));
+         UInt_t nev = (UInt_t)atoll(Row->GetField(1));
+         if (DBG) printf(" inside loop over runs: ru %i idrun %i nev %i \n",ru,idrun,nev);
+         //        printf(" inside loop over runs: ru %i idrun %i nev %i \n",ru,idrun,nev);//TOGLITOGLI
+         // now look for this run in the level2 file, it must be present! code is taken from updateruninfo of course
+         Bool_t rfound = false;
+         totrunentry = 0LL;
+         runfirstentry = 0LL;
+         for (Int_t r=0; r< run_tree->GetEntries();r++){
+           run_tree->GetEntry(r);//update runinfo
+           if ( r > 0 ){
+             totrunentrymin = totrunentrymax+1;
+           } else {
+             totrunentrymin = 0LL;
+           }
+           totrunentry += GetRunInfo()->NEVENTS;
+           totrunentrymax = totrunentry - 1 - prevshift; // prevshift is needed to handle nested+DV_skipped packets
+           irun = r;
+           if (idrun == GetRunInfo()->ID){
+             if ( totrunentrymin > iev ){ // there is a shift (nested+DV_skipped packets)
+               if (DBG) printf("PamLevel2::GetYodaEntry - unconsistent iev - nevents, probable DBL0-L2 async\n");
+               if (DBG) printf("PamLevel2::GetYodaEntry - totrunentrymin %lld iev %lld prevshift %lld totrunentrymax %lld \n",totrunentrymin,iev,prevshift,totrunentrymax);
+               //              printf("PamLevel2::GetYodaEntry - unconsistent iev - nevents, probable DBL0-L2 async\n");
+               //              printf("PamLevel2::GetYodaEntry - totrunentrymin %lld iev %lld prevshift %lld totrunentrymax %lld \n",totrunentrymin,iev,prevshift,totrunentrymax);//TOGLITOGLI
+               prevshift += (totrunentrymin-iev); // add the new shift to total shift
+               totrunentrymin -= (totrunentrymin-iev); // shift run position min
+               totrunentrymax -= (totrunentrymin-iev); // shift run position max
+               if (DBG) printf("PamLevel2::GetYodaEntry - totrunentrymin %lld iev %lld prevshift %lld totrunentrymax %lld \n",totrunentrymin,iev,prevshift,totrunentrymax);
+               //              printf("PamLevel2::GetYodaEntry - totrunentrymin %lld iev %lld prevshift %lld totrunentrymax %lld \n",totrunentrymin,iev,prevshift,totrunentrymax);//TOGLITOGLI
+             }
+             runfirstentry = totrunentrymin; // first entry of the run in the level2
+             //
+             if (gltsync)
+               delete gltsync; // Emiliano
+             if (!dbc || (dbc && !dbc->IsConnected()))
+               SetDBConnection(); //Emiliano
+             gltsync = new GL_TIMESYNC(GetRunInfo()->ID_ROOT_L0, "ID", dbc, false); // Emiliano
+             if (dbc){
+               dbc->Close(); // Emiliano
+               delete dbc;
+               dbc=0;
+             }
+             if (gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT) > gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT)) { // Emiliano
+               cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- WARNING -- irun " << irun
+                    << "  has RUNHEADER_OBT>=RUNTRAILER_OBT " << endl;
+               cout
+                 << "                                                            (NB!! in this case some events could be assigned to a wrong run)"
+                 << endl;
+             }
+             //
+             if (DBG) printf(" found \n");
+             //            printf(" found \n");//TOGLITOGLI
+             rfound = true;
+             //
+             break;
+           }
+         } // loop over run
+         if ( !rfound ){
+           printf(" PamLevel2::GetYodaEntry() ERROR! run is not present in the level2 file!!! \n");
+           cout << " OK this is a bug, write to Emiliano, Emiliano.Mocchiutti@ts.infn.it " << endl;
+           cout << "\nFor bug reporting instructions, please see for example:\n";
+           cout << "     <http://www.ts.infn.it/~mocchiut/bugs/bugs.html>.\n";
+           cout << "  " << endl;
+           return 0;
+         }
+         // here we got the first run and we can check if it contains the level0 event
+         if (!GetYodaTree()){
+           printf(" PamLevel2::GetYodaEntry() : ERROR no level0 file loaded!\n");
+           return 0;
+         }
+         // get the current run entry
+         irunentry = iev - runfirstentry;
+         if (irunentry < 0) {
+           if (DBG) cout << "Int_t PamLevel2::GetYodaEntry() -- ATTENZIONE -- irunentry negativo?!?! "<<(Int_t)irunentry<<endl;
+           //          cout << "Int_t PamLevel2::GetYodaEntry() -- ATTENZIONE -- irunentry negativo?!?! "<<(Int_t)irunentry<<endl; // TOGLITOGLI
+           irunentry = 0LL;
+         }
+         //  ---------------------------------
+         //  if file is NOT a preselected file
+         //  ---------------------------------
+         quellagiusta = irunentry + (Long64_t)(run_obj->EV_FROM); // prevshift already included in irunentry
+         if (DBG){
+           cout << " irun "<< irun << " irunentry "<< irunentry<<" run_obj->EV_FROM "<<run_obj->EV_FROM <<" quella giusta "<<quellagiusta << endl;
+           cout << " iroot "<<iroot<<" run_obj->ID_ROOT_L0 "<<run_obj->ID_ROOT_L0<<endl;
+           cout << " time "<< abstime << endl;
+         }
+         //        cout << " irun "<< irun << " irunentry "<< irunentry<<" run_obj->EV_FROM "<<run_obj->EV_FROM <<" quella giusta "<<quellagiusta << endl;
+         //        cout << " iroot "<<iroot<<" run_obj->ID_ROOT_L0 "<<run_obj->ID_ROOT_L0<<endl;
+         //        cout << " time "<< abstime << endl; // TOGLITOGLI
+         shift = 0;
+         answer = quellagiusta + shift + yprevshift; // prevshift already included in irunentry
+         readl0 = l0_tree->GetEntry(answer); // prevshift already included in irunentry
+         if (DBG){
+           printf(" siamo qua shift %lld yprevshift %lld answer %lld \n",shift,yprevshift,answer);
+         }
+         //        printf(" siamo qua shift %lld yprevshift %lld answer %lld \n",shift,yprevshift,answer);//TOGLITOGLI
+         while ( (obt != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()) || pktn != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter())) && (quellagiusta + (Long64_t) shift) < GetYodaTree()->GetEntries() && shift < maxshift ){
+           if (shift > 0) {
+             if (DBG) cout << " PKTNUM  L2 --- " << pktn << " --- L0 --- " << GetEventHeader()->GetPscuHeader()->GetCounter() << endl;
+             if (DBG)
+               cout << "         RUN: ID " << GetRunInfo()->ID << " ID_ROOT_L0 " << run_obj->ID_ROOT_L0 << " ID_RUN_FRAG "
+                    << GetRunInfo()->ID_RUN_FRAG << " EV_FROM " << GetRunInfo()->EV_FROM << endl;
+             if (DBG)
+               cout << "         L2 <--> L0 mismatch ( irun " << irun << " irunentry " << irunentry << " shift " << shift
+                    << " prevshift " << prevshift << " )" << endl;
+           }
+           answer = quellagiusta +  shift+ yprevshift;
+           readl0 = l0_tree->GetEntry(answer);
+           //          printf(" inside inside while shift %lld yprevshift %lld answer %lld \n",shift,yprevshift,answer);//TOGLITOGLI
+           if (!GetEventHeader()) {
+             cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- missing EventHeader " << endl;
+             return 0;
+           }
+           //
+           if (yprevshift != 0 && (quellagiusta + (Long64_t) shift) == GetYodaTree()->GetEntries()) {
+             if (DBG) printf(" reset inside while shift %lld yprevshift %lld answer %lld \n",shift,yprevshift,answer);
+             //            printf(" reset inside while shift %lld yprevshift %lld answer %lld \n",shift,yprevshift,answer);//TOGLITOGLI
+             yprevshift = 0;
+             shift = -1;
+           };
+           shift++;
+         }
+         if ( obt != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()) || pktn != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter()) ){
+           //still not the good run... continue with the nex one!
+           printf("still not the good run... continue with the nex one!\n");
+         } else {
+           if (DBG) cout << "LA ENTRY GIUSTA E`: "<<quellagiusta<<" (spero...)"<<endl;
+           //          cout << "LA ENTRY GIUSTA E`: "<<answer<<" (spero...)"<<endl;//TOGLITOGLI
+           if (shift > 1) yprevshift = (shift - 1);
+           if (Row) delete Row;
+           delete pResult;
+           if (dbc){
+             dbc->Close(); // Emiliano
+             delete dbc;
+             dbc=0;
+           }
+           il0entry = answer;
+           return readl0;
+         }
+         // perhaps it is all
+       }// loop over runs containing the event
+       if (Row) delete Row;
+       delete pResult;
+       if (dbc){
+         dbc->Close(); // Emiliano
+         delete dbc;
+         dbc=0;
+       }
+       // arriving here it means no run found, cannot be! error!
+       printf(" PamLevel2::GetYodaEntry() ERROR! run is not present in the level0 files!!! \n");
+       cout << " OK this is a bug, write to Emiliano, Emiliano.Mocchiutti@ts.infn.it " << endl;
+       cout << "\nFor bug reporting instructions, please see for example:\n";
+       cout << "     <http://www.ts.infn.it/~mocchiut/bugs/bugs.html>.\n";
+       cout << "  " << endl;
+       return 0;
+     } else {
+       if (DBG) cout << "=> LA ENTRY GIUSTA E`: "<<answer<<" (spero...)"<<endl;
+       //    cout << "=> LA ENTRY GIUSTA E`: "<<answer<<" (spero...)"<<endl;
+       //    printf("obt %lld (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()) %i  pktn %lld (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter() %i \n",obt,(UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()), pktn, (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter()) );
+       if (shift > 1) yprevshift = (shift - 1);
+       il0entry = answer;
+       return readl0;
+     }
+     /*  } // if selli 0 || 2
+   if ( SELLI == 1 && hasL0EE ){
+     sel_tree->GetEntry(iev);
+     Long64_t answer = il0entry;
+     Int_t readl0 = 0;
+     readl0 = l0_tree->GetEntry(answer);
+     return readl0;
+     }*/
+   printf(" PamLevel2::GetYodaEntry() ERROR! \n");
+   cout << " Entry not found! OK this is a bug, write to Emiliano, Emiliano.Mocchiutti@ts.infn.it " << endl;
+   cout << "\nFor bug reporting instructions, please see for example:\n";
+   cout << "     <http://www.ts.infn.it/~mocchiut/bugs/bugs.html>.\n";
+   cout << "  " << endl;
+   return 0;
  }
  /**
   * \Brief Set DB connection
   */
-Line 4604 
 Long64_t PamLevel2::GetReadEntry() {
+Line 6013 
 Long64_t PamLevel2::GetReadEntry() {
  void PamLevel2::SetSortingMethod(TString how) {
    if (howtosort != how) {
      issorted = false;
+     issorted_new = false;
    }
    howtosort = how;
  }

 Legend:



Removed from v.1.87
 


changed lines


 
Added in v.1.99
 Legend:



Removed from v.1.87
 


changed lines


 
Added in v.1.99
-Removed from v.1.87
+Added in v.1.99

	ViewVC Help
Powered by ViewVC 1.1.23