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

Diff of /PamelaLevel2/src/PamLevel2.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 1.5 by pam-fi,
Mon Oct  9 08:57:42 2006 UTC
+revision 1.19 by pam-fi,
Thu Jan 18 11:56:12 2007 UTC
 Line 7
   * Default constructor
   */
  PamTrack::PamTrack(){
-     trk_track  = this->TrkTrack::GetTrkTrack();
+     trk_track  = 0;
-     calo_track = this->CaloTrkVar::GetCaloTrkVar();
+     calo_track = 0;
-     tof_track  = this->ToFTrkVar::GetToFTrkVar();
+     tof_track  = 0;
+     candeleteobj = 0;
  };
  //--------------------------------------
  //
-Line 19 
 PamTrack::PamTrack(){
+Line 20 
 PamTrack::PamTrack(){
   * Constructor
   */
  PamTrack::PamTrack(TrkTrack* t, CaloTrkVar* c, ToFTrkVar* o){
-     trk_track  = this->TrkTrack::GetTrkTrack();
-     calo_track = this->CaloTrkVar::GetCaloTrkVar();
+     trk_track  = 0;
-     tof_track  = this->ToFTrkVar::GetToFTrkVar();
+     calo_track = 0;
-     if(t) *trk_track  = *t;
+     tof_track  = 0;
-     if(c) *calo_track = *c;
+ //     if(t)trk_track  = new TrkTrack(*t);
-     if(o) *tof_track  = *o;
+ //     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;
+     candeleteobj = 0;
  };
+ PamTrack::PamTrack(const PamTrack& track){
+     TrkTrack   *t = track.trk_track;
+     CaloTrkVar *c = track.calo_track;
+     ToFTrkVar  *o = track.tof_track;
+     trk_track  = 0;
+     calo_track = 0;
+     tof_track  = 0;
+     if(t)trk_track  = new TrkTrack(*t);
+     if(c)calo_track = new CaloTrkVar(*c);
+     if(o)tof_track  = new ToFTrkVar(*o);
+     candeleteobj = 1;
+ }
+ void PamTrack::Clear(){
+ //    cout << "PamTrack::Clear() "<<candeleteobj<<endl;
+     if(candeleteobj){
+         if(trk_track)  trk_track->TrkTrack::Clear();
+         if(calo_track) calo_track->CaloTrkVar::Clear();//???
+         if(tof_track)  tof_track->ToFTrkVar::Clear();//???
+     }else{
+         trk_track  = 0;
+         calo_track = 0;
+         tof_track  = 0;
+     }
+ }
+ void PamTrack::Delete(){
+ //    cout << "PamTrack::Delete() "<<candeleteobj<<endl;
+     if(candeleteobj){
+         if(trk_track)  {
+             trk_track->TrkTrack::Clear();
+             delete trk_track;
+         }
+         if(calo_track){
+             calo_track->CaloTrkVar::Clear();//???
+             delete calo_track;
+         }
+         if(tof_track){
+             tof_track->ToFTrkVar::Clear();//???
+             delete tof_track;
+         }
+     }else{
+         Clear();
+     }
+ }
  //--------------------------------------
  //
  //
-Line 36 
 PamTrack::PamTrack(TrkTrack* t, CaloTrkV
+Line 89 
 PamTrack::PamTrack(TrkTrack* t, CaloTrkV
   */
  PamLevel2::PamLevel2(){
-     trk_l1_obj  = this->TrkLevel1::GetTrkLevel1();
+ //     trk2_obj  = TrkLevel2::GetTrkLevel2();
-         trk_obj     = this->TrkLevel2::GetTrkLevel2();
+ //     trk1_obj  = TrkLevel1::GetTrkLevel1();
-         calo_obj    = this->CaloLevel2::GetCaloLevel2();
+ //     trkh_obj  = TrkHough::GetTrkHough();
-     tof_obj     = this->ToFLevel2::GetToFLevel2();
+ //     calo1_obj = CaloLevel1::GetCaloLevel1();
-     trig_obj    = this->TrigLevel2::GetTrigLevel2();
+ //     calo2_obj = CaloLevel2::GetCaloLevel2();
-     s4_obj      = this->S4Level2::GetS4Level2();
+ //     tof_obj   = ToFLevel2::GetToFLevel2();
-     nd_obj      = this->NDLevel2::GetNDLevel2();
+ //     trig_obj  = TrigLevel2::GetTrigLevel2();
-     ac_obj      = this->AcLevel2::GetAcLevel2();
+ //     s4_obj    = S4Level2::GetS4Level2();
-         orb_obj     = this->OrbitalInfo::GetOrbitalInfo();
+ //     nd_obj    = NDLevel2::GetNDLevel2();
+ //     ac_obj    = AcLevel2::GetAcLevel2();
+ //     orb_obj   = OrbitalInfo::GetOrbitalInfo();
+     trk2_obj  = 0;
+     trk1_obj  = 0;
+     trkh_obj  = 0;
+     calo1_obj = 0;
+     calo2_obj = 0;
+     tof_obj   = 0;
+     trig_obj  = 0;
+     s4_obj    = 0;
+     nd_obj    = 0;
+     ac_obj    = 0;
+     orb_obj   = 0;
+     run_obj   = 0;//new GL_RUN();
+     soft_obj   = 0;// Emiliano
+     irun = -1;
+     runfirstentry = 0ULL;
+     runlastentry = 0ULL;
-         run_obj     = new GL_RUN();
+     for(Int_t i=0; i<8; i++ )tree_clone[i]=NULL;
-         sorted_tracks = new TRefArray();
-         CAL = true;
+ //    sorted_tracks = 0;//new TRefArray();
-         TRK = true;
-         TRG = true;
+     CAL1 = true;
-         TOF = true;
+     CAL2 = true;
-         S4  = true;
+     TRK2 = true;
-         ND  = true;
+     TRK1 = false;
-         AC  = true;
+     TRKh = false;
-         ORB = true;
+     TRG = true;
+     TOF = true;
+     S4  = true;
+     ND  = true;
+     AC  = true;
+     ORB = true;
+     RUN = true;
-         TRK_L1 = false;
+     tsorted=0;
+     timage=0;
-         Tout  = NULL;
  };
  /**
-  * Destructor
+  * Delete the event (act as Dtor)
   */
- PamLevel2::~PamLevel2(){
+ void PamLevel2::Delete(){
-         TrkLevel1::Clear();
-         TrkLevel2::Clear();
-         CaloLevel2::Clear();
-         ToFLevel2::Clear();
-         TrigLevel2::Clear();
-         S4Level2::Clear();
-         NDLevel2::Clear();
-         AcLevel2::Clear();
-         OrbitalInfo::Clear();
-         delete run_obj;
- //      delete sorted_tracks;
-         sorted_tracks->Delete(); // clean the reference array
-         if(Tout)Tout->Delete(); // delete loaded tree from memory
+     if(run_obj)delete run_obj;
+     if(soft_obj)delete soft_obj; //Emiliano
+ //    cout << "void PamLevel2::Clear()"<<endl;
+     if(trk1_obj) delete trk1_obj;
+     if(trk2_obj) delete trk2_obj;
+     if(trkh_obj) delete trkh_obj;
+     if(calo1_obj)delete calo1_obj;
+     if(calo2_obj)delete calo2_obj;
+     if(tof_obj)  delete tof_obj;
+     if(trig_obj) delete trig_obj;
+     if(s4_obj)   delete s4_obj;
+     if(nd_obj)   delete nd_obj;
+     if(ac_obj)   delete ac_obj;
+     if(orb_obj)  delete orb_obj;
+     if(tsorted){
+         tsorted->Delete();
+         delete tsorted;
+     }
+     if(timage){
+         timage->Delete();
+         delete timage;
+     }
  };
  /**
-  * Clear the event
+  * Clear the event (NB! does not deallocate objects)
   */
  void PamLevel2::Clear(){
-         TrkLevel1::Clear();
+ //    cout << "void PamLevel2::Clear()"<<endl;
-         TrkLevel2::Clear();
+ //
-         CaloLevel2::Clear();
+ // This method is called once for every entry but RunInfo and SoftInfo do not change until the next run so we cannot clear them here unless we don't
-         ToFLevel2::Clear();
+ // want to load them for each event even if they are the same...
-         TrigLevel2::Clear();
+ //
-         S4Level2::Clear();
+ //    if(run_obj)delete run_obj;
-         NDLevel2::Clear();
+ //    if(run_obj) run_obj->Clear();  // Emiliano: Do not deallocate run_obj here, it will give segmentation fault! call clear instead
-         AcLevel2::Clear();
+ //    if(soft_obj) soft_obj->Clear();
-         OrbitalInfo::Clear();
+     if(trk1_obj) trk1_obj->Clear();
-         sorted_tracks->Delete(); // clean the reference array
+     if(trk2_obj) trk2_obj->Clear();
+     if(trkh_obj) trkh_obj->Clear();
+     if(calo1_obj)calo1_obj->Clear();
+     if(calo2_obj)calo2_obj->Clear();
+     if(tof_obj)  tof_obj->Clear();
+     if(trig_obj) trig_obj->Clear();
+     if(s4_obj)   s4_obj->Clear();
+     if(nd_obj)   nd_obj->Clear();
+     if(ac_obj)   ac_obj->Clear();
+     if(orb_obj)  orb_obj->Clear();
+ //    if(sorted_tracks)sorted_tracks->Clear();
+ //    sorted_tracks.Clear();
+     if(tsorted){
+         tsorted->Delete();
+     }
+     if(timage){
+         timage->Delete();
+     }
  };
-Line 112 
 void PamLevel2::Clear(){
+Line 215 
 void PamLevel2::Clear(){
  //
  //
  //--------------------------------------
+ void *PamLevel2::GetPointerTo(const char* c ){
+     TString objname = c;
+     if(!objname.CompareTo("TrkLevel1"))  {
+         if(!trk1_obj){
+             trk1_obj  = new TrkLevel1();
+             trk1_obj->Set();
+         }
+         return &trk1_obj;
+     };
+     if(!objname.CompareTo("TrkLevel2"))  {
+         if(!trk2_obj){
+             trk2_obj  = new TrkLevel2();
+             trk2_obj->Set();
+         }
+         return &trk2_obj;
+     };
+     if(!objname.CompareTo("TrkHough"))   {
+         if(!trkh_obj)  trkh_obj  = new TrkHough();
+         return &trkh_obj;
+     };
+     if(!objname.CompareTo("CaloLevel1")) {
+         if(!calo1_obj) calo1_obj = new CaloLevel1();
+         return &calo1_obj;
+     };
+     if(!objname.CompareTo("CaloLevel2")) {
+         if(!calo2_obj){
+             calo2_obj = new CaloLevel2();
+             calo2_obj->Set();
+         };
+         return &calo2_obj;
+     };
+     if(!objname.CompareTo("ToFLevel2"))  {
+         if(!tof_obj){
+             tof_obj   = new ToFLevel2();
+             tof_obj->Set();
+         }
+         return &tof_obj;
+     };
+     if(!objname.CompareTo("TrigLevel2")) {
+         if(!trig_obj)  trig_obj  = new TrigLevel2();
+         return &trig_obj;
+     };
+     if(!objname.CompareTo("S4Level2"))   {
+         if(!s4_obj)    s4_obj    = new S4Level2();
+         return &s4_obj;
+     };
+     if(!objname.CompareTo("NDLevel2"))   {
+         if(!nd_obj)    nd_obj    = new NDLevel2();
+         return &nd_obj;
+     };
+     if(!objname.CompareTo("AcLevel2"))   {
+         if(!ac_obj)    ac_obj    = new AcLevel2();
+         return &ac_obj;
+     };
+     if(!objname.CompareTo("OrbitalInfo")){
+         if(!orb_obj)   orb_obj   = new OrbitalInfo();
+         return &orb_obj;
+     };
+     if(!objname.CompareTo("RunInfo"))return &run_obj;
+     if(!objname.CompareTo("SoftInfo"))return &soft_obj; // Emiliano
+     return NULL;
+ };
+ //--------------------------------------
+ //
+ //
+ //--------------------------------------
  /**
   * Retrieves the calorimeter track matching the seqno-th tracker stored track.
   * (If seqno = -1 retrieves the self-trigger calorimeter track)
   */
   CaloTrkVar *PamLevel2::GetCaloStoredTrack(int seqno){
-          if( CaloLevel2::ntrk()==0 ){
+      if( !calo2_obj )return 0;
-                  cout << "PamLevel2::GetCaloStoredTrack(int) : requested tracker SeqNo "<< seqno <<" but no Calorimeter tracks are stored"<<endl;
-                  return NULL;
-          };
-          CaloTrkVar *c = 0;
-          Int_t it_calo=0;
-          do{
-                  c = CaloLevel2::GetCaloTrkVar(it_calo);
-                  it_calo++;
-          } while( seqno != c->trkseqno && it_calo < CaloLevel2::ntrk());
-          if(seqno != c->trkseqno){
-                  c = 0;
-                  if(seqno!=-1)cout << "PamLevel2::GetCaloStoredTrack(int) : requested tracker SeqNo "<< seqno <<" does not match Calorimeter stored tracks"<<endl;
-          };
-          return c;
+      if( calo2_obj->CaloLevel2::ntrk()==0 ){
+          cout << "PamLevel2::GetCaloStoredTrack(int) : requested tracker SeqNo "<< seqno <<" but no Calorimeter tracks are stored"<<endl;
+          return NULL;
+      };
+      CaloTrkVar *c = 0;
+      Int_t it_calo=0;
+      do{
+          c = calo2_obj->CaloLevel2::GetCaloTrkVar(it_calo);
+          it_calo++;
+      } while( c && seqno != c->trkseqno && it_calo < calo2_obj->CaloLevel2::ntrk());
+      if(!c || seqno != c->trkseqno){
+          c = 0;
+          if(seqno!=-1)cout << "PamLevel2::GetCaloStoredTrack(int) : requested tracker SeqNo "<< seqno <<" does not match Calorimeter stored tracks"<<endl;
+      };
+      return c;
   };
  //--------------------------------------
   //
-Line 148 
 void PamLevel2::Clear(){
+Line 324 
 void PamLevel2::Clear(){
   */
   ToFTrkVar *PamLevel2::GetToFStoredTrack(int seqno){
-          if( ToFLevel2::ntrk()==0 ){
+      if( !tof_obj )return 0;
-                  cout << "PamLevel2::GetToFStoredTrack(int) : requested tracker SeqNo "<< seqno <<" but no ToF tracks are stored"<<endl;
-                  return NULL;
-          };
-          ToFTrkVar *c = 0;
-          Int_t it_tof=0;
-          do{
-                  c = ToFLevel2::GetToFTrkVar(it_tof);
-                  it_tof++;
-          } while( seqno != c->trkseqno && it_tof < ToFLevel2::ntrk());
-          if(seqno != c->trkseqno){
-                  c = 0;
-                  if(seqno!=-1)cout << "PamLevel2::GetToFStoredTrack(int) : requested tracker SeqNo "<< seqno <<" does not match ToF stored tracks"<<endl;
-          };
-          return c;
+      if( tof_obj->ToFLevel2::ntrk()==0 ){
+          cout << "PamLevel2::GetToFStoredTrack(int) : requested tracker SeqNo "<< seqno <<" but no ToF tracks are stored"<<endl;
+          return NULL;
+      };
+      ToFTrkVar *c = 0;
+      Int_t it_tof=0;
+      do{
+          c = tof_obj->ToFLevel2::GetToFTrkVar(it_tof);
+          it_tof++;
+      } while( c && seqno != c->trkseqno && it_tof < tof_obj->ToFLevel2::ntrk());
+      if(!c || seqno != c->trkseqno){
+          c = 0;
+          if(seqno!=-1)cout << "PamLevel2::GetToFStoredTrack(int) : requested tracker SeqNo "<< seqno <<" does not match ToF stored tracks"<<endl;
+      };
+      return c;
   };
  //--------------------------------------
-Line 177 
 void PamLevel2::Clear(){
+Line 355 
 void PamLevel2::Clear(){
   * Give the pamela track associated to a tracker track, retrieving related calorimeter and tof track information.
   */
   PamTrack* PamLevel2::GetPamTrackAlong(TrkTrack* t){
-          CaloTrkVar *c = 0;
+      cout <<"PamLevel2::GetPamTrackAlong(TrkTrack* t) **obsolete** "<<endl;
-          ToFTrkVar  *o = 0;
+      cout <<"(if you use it, remember to delete the PamTrack object)"<<endl;
-          if(CAL) c = GetCaloStoredTrack(t->GetSeqNo());
+      CaloTrkVar *c = 0;
-          if(TOF) o = GetToFStoredTrack(t->GetSeqNo());
+      ToFTrkVar  *o = 0;
+      if(CAL2) c = GetCaloStoredTrack(t->GetSeqNo());
+      if(TOF) o = GetToFStoredTrack(t->GetSeqNo());
  //    if(t && c && o)track = new PamTrack(t,c,o);
-          PamTrack *track = new PamTrack(t,c,o);
+      PamTrack *track = new PamTrack(t,c,o);
-          return track;
+      return track;
   };
  //--------------------------------------
-Line 202 
 void PamLevel2::Clear(){
+Line 383 
 void PamLevel2::Clear(){
  PamTrack* PamLevel2::GetStoredTrack(Int_t itrk){
-         PamTrack *track = 0;
+     cout <<"PamLevel2::GetStoredTrack(Int_t itrk) **to-be-updated** "<<endl;
+     cout <<"for the moment, better use separately the methods: TrkLevel2::GetStoredTrack(seqno) CaloLevel2::GetCaloTrkVar(Int_t notrack) ToFLevel2::GetToFTrkVar(Int_t notrack)"<<endl;
-         if( itrk >=0 && itrk < TrkLevel2::ntrk() ){
+     cout <<"(if you use it, remember to delete the PamTrack object)"<<endl;
+     PamTrack *track = 0;
-                 TrkTrack *t = TrkLevel2::GetStoredTrack(itrk);
-                 track = GetPamTrackAlong(t);
+     if( itrk >=0 && itrk < trk2_obj->TrkLevel2::ntrk() ){
-         }else{
+         TrkTrack *t = trk2_obj->TrkLevel2::GetStoredTrack(itrk);
-                 cout << "PamLevel2::GetStoredTrack(int) : tracker track SeqNo "<< itrk <<" does not exist (GetNTracks() = "<<TrkLevel2::GetNTracks()<<")"<<endl;
+         track = GetPamTrackAlong(t);
-         };
-         return track;
+     }else{
+         cout << "PamLevel2::GetStoredTrack(int) : tracker track SeqNo "<< itrk <<" does not exist (GetNTracks() = "<<trk2_obj->TrkLevel2::GetNTracks()<<")"<<endl;
+     };
+     return track;
  }
  //--------------------------------------
  //
-Line 224 
 PamTrack* PamLevel2::GetStoredTrack(Int_
+Line 410 
 PamTrack* PamLevel2::GetStoredTrack(Int_
   * Sort physical (tracker) tracks and stores them in the TRefArray (of TrkTrack objects) which pointer is  PamLevel2::sorted_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).
   * The default sorting cryterium is "TOF+CAL".
-Line 233 
 PamTrack* PamLevel2::GetStoredTrack(Int_
+Line 419 
 PamTrack* PamLevel2::GetStoredTrack(Int_
   */
  void PamLevel2::SortTracks(TString how){
+ //    cout <<" PamLevel2::SortTracks(TString how) "<<endl;
+     if( !trk2_obj ){
+         cout << "void PamLevel2::SortTracks(TString how):  TrkLevel2 not loaded !!!";
+         return;
+     };
+ //    cout << "call SortTracs() "<<endl;
    //Save current Object count
-         Int_t ObjectNumber = TProcessID::GetObjectCount();
+     Int_t ObjectNumber = TProcessID::GetObjectCount();
-         sorted_tracks->Delete(); //temporaneo???
+ //    cout << "ObjectNumber  "<<ObjectNumber <<endl;
+ //     if(!sorted_tracks)sorted_tracks = new TRefArray();
+ //     sorted_tracks->Clear();
+ //    sorted_tracks.Clear();
+     if(!tsorted)tsorted = new TClonesArray("PamTrack",trk2_obj->GetNTracks());
+     tsorted->Delete();
+     TClonesArray &ttsorted = *tsorted;
+     if(!timage)timage = new TClonesArray("PamTrack",trk2_obj->GetNTracks());
+     timage->Delete();
+     TClonesArray &ttimage = *timage;
      // loop over the tracks sorted by the tracker
-         Bool_t use_TRK = how.Contains("TRK", TString::kIgnoreCase);
+     Bool_t use_TRK = how.Contains("TRK", TString::kIgnoreCase);
-         Bool_t use_CAL = how.Contains("CAL", TString::kIgnoreCase);
+     Bool_t use_CAL = how.Contains("CAL", TString::kIgnoreCase);
-         Bool_t use_TOF = how.Contains("TOF", TString::kIgnoreCase);
+     Bool_t use_TOF = how.Contains("TOF", TString::kIgnoreCase);
-         if( !CAL &&  use_CAL) use_CAL = false;
+     if( !CAL2 &&  use_CAL) use_CAL = false;
-         if( !TOF &&  use_TOF) use_TOF = false;
+     if( !TOF &&  use_TOF) use_TOF = false;
+     if( !TRK2 ){
+ //      cout << "SortTracks() : without tracker does not work!!! (not yet)" << endl;
+         return;
+     };
+     //   cout << "use_CAL "<<use_CAL<<" use_TOF "<<use_TOF<<" use_TRK "<<use_TRK <<endl;
+     for(Int_t i=0; i < trk2_obj->TrkLevel2::GetNTracks(); i++){
-         if( !TRK ){
+         TrkTrack   *ts = 0;
-                 cout << "SortTracks() : without tracker does not work!!! (not yet)" << endl;
+         CaloTrkVar *cs = 0;
-                 return;
+         ToFTrkVar  *os = 0;
-         };
-         for(Int_t i=0; i < TrkLevel2::GetNTracks(); i++){
-                 TrkTrack *ts = 0;
          // get tracker tracks
-                 TrkTrack   *tp = TrkLevel2::GetTrack(i);                    //tracker
+         TrkTrack   *tp = trk2_obj->TrkLevel2::GetTrack(i);                    //tracker
- //              CaloTrkVar *cp = GetCaloStoredTrack(tp->GetSeqNo());
+         CaloTrkVar *cp = GetCaloStoredTrack(tp->GetSeqNo());
- //              ToFTrkVar  *op = GetToFStoredTrack(tp->GetSeqNo());
+         ToFTrkVar  *op = GetToFStoredTrack(tp->GetSeqNo());
-                 CaloTrkVar *cp = 0;
-                 ToFTrkVar  *op = 0;
+         TrkTrack   *ti = 0;              //tracker (image)
+         CaloTrkVar *ci = 0;
+         ToFTrkVar  *oi = 0;
+ //      cout << "trk track n. "<<i << " "<<hex<< tp <<dec<< endl;
          // if track has an image, check image selection
-                 if(tp->HasImage()){
+         if(tp->HasImage()){
-                         TrkTrack   *ti = TrkLevel2::GetTrackImage(i);              //tracker (image)
+             ti = trk2_obj->TrkLevel2::GetTrackImage(i);              //tracker (image)
- //                      CaloTrkVar *ci = GetCaloStoredTrack(ti->GetSeqNo());
+             ci = GetCaloStoredTrack(ti->GetSeqNo());
- //                      ToFTrkVar  *oi = GetToFStoredTrack(ti->GetSeqNo());
+             oi = GetToFStoredTrack(ti->GetSeqNo());
-                         CaloTrkVar *ci = 0;
-                         ToFTrkVar  *oi = 0;
+ //          cout << "its image "<<i << " "<<hex<< ti <<dec<< endl;
              //assign starting scores
-                         Int_t tp_score = 0;  //main track sorted by the tracker
+             Int_t tp_score = 0;  //main track sorted by the tracker
-                         Int_t ti_score = 0;  //image track
+             Int_t ti_score = 0;  //image track
              // ------------------------
              // calorimeter check
              // ------------------------
-                 // check the Y spatial residual on the first calorimeter plane
+             // check the Y spatial residual on the first calorimeter plane
-                 // (cut on calorimeter variables from Emiliano)
+             // (cut on calorimeter variables from Emiliano)
-                         if(
+             if( use_CAL && !calo2_obj ){
-                                 use_CAL            &&
+                 cout << "void PamLevel2::SortTracks(TString how): how= "<<how<<" but CaloLevel2 not loaded !!!";
-                                 npcfit[1] > 15     &&   //no. of fit planes on Y view
+                 return;
-                                 varcfit[1] < 1000. &&  //fit variance on Y view
+             };
-                                 true){
+             if(
+                 use_CAL            &&
-                                 cp = GetCaloStoredTrack(tp->GetSeqNo());
+                 calo2_obj->npcfit[1] > 15     &&   //no. of fit planes on Y view
-                                 ci = GetCaloStoredTrack(ti->GetSeqNo());
+                 calo2_obj->varcfit[1] < 1000. &&  //fit variance on Y view
+                 true){
-                                 Float_t resy_p = cp->tbar[0][1] - cbar[0][1]; if(resy_p < 0)resy_p= - resy_p;
-                                 Float_t resy_i = ci->tbar[0][1] - cbar[0][1]; if(resy_i < 0)resy_i= - resy_i;
+                 Float_t resy_p = cp->tbar[0][1] - calo2_obj->cbar[0][1]; if(resy_p < 0)resy_p= - resy_p;
-                                 if(resy_p <= resy_i) tp_score++;
+                 Float_t resy_i = ci->tbar[0][1] - calo2_obj->cbar[0][1]; if(resy_i < 0)resy_i= - resy_i;
-                                 else                 ti_score++;
-                         };
+                 if(resy_p <= resy_i) tp_score++;
+                 else                 ti_score++;
+ //              cout << "CALO "<<tp_score<<ti_score<<endl;
+             };
              // ------------------------
              // TOF check
              // ------------------------
-                 // check the number of hit pmts along the track
+             // check the number of hit pmts along the track
-                 // on S12 S21 and S32, where paddles are parallel to Y axis
+             // on S12 S21 and S32, where paddles are parallel to Y axis
-                         if( use_TOF ){
+             if( use_TOF && !tof_obj ){
+                 cout << "void PamLevel2::SortTracks(TString how): how= "<<how<<" but ToFLevel2 not loaded !!!";
-                                 Int_t nphit_p =0;
+                 return;
-                                 Int_t nphit_i =0;
+             };
+             if( use_TOF ){
-                                 op = GetToFStoredTrack(tp->GetSeqNo());
-                                 oi = GetToFStoredTrack(ti->GetSeqNo());
+                 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++){
+                 for (Int_t ih=0; ih < op->npmtadc; ih++){
-                                         Int_t pl = GetPlaneIndex( (op->pmtadc).At(ih) );
+                     Int_t pl = tof_obj->GetPlaneIndex( (op->pmtadc).At(ih) );
-                                         if(pl == 1 || pl == 2 || pl == 5)nphit_p++;
+                     if(pl == 1 || pl == 2 || pl == 5)nphit_p++;
-                                 };
+                 };
-                                 for (Int_t ih=0; ih < oi->npmtadc; ih++){
+                 for (Int_t ih=0; ih < oi->npmtadc; ih++){
-                                         Int_t pl = GetPlaneIndex( (oi->pmtadc).At(ih) );
+                     Int_t pl = tof_obj->GetPlaneIndex( (oi->pmtadc).At(ih) );
-                                         if(pl == 1 || pl == 2 || pl == 5)nphit_i++;
+                     if(pl == 1 || pl == 2 || pl == 5)nphit_i++;
-                                 };
+                 };
-                                 if(
+                 if(
-                                         use_TOF            &&
+                     use_TOF            &&
-                                         (nphit_p+nphit_i) !=0 &&
+                     (nphit_p+nphit_i) !=0 &&
-                                         true){
+                     true){
-                                         if( nphit_p >= nphit_i) tp_score++;
+                     if( nphit_p >= nphit_i) tp_score++;
-                                         else                                              ti_score++;
+                     else ti_score++;
-                                 };
+                 };
-                         };
+ //              cout << "TOF "<<tp_score<<ti_score<<endl;
-                         if(tp_score == ti_score) use_TRK = true;
+             };
-                 // ------------------------
+             if(tp_score == ti_score) use_TRK = true;
+             // ------------------------
              // tracker check
              // ------------------------
-                 // chi**2 difference is not always large enough to distinguish among
+             // chi**2 difference is not always large enough to distinguish among
-                 // the real track and its image.
+             // the real track and its image.
-                 // Tracker check will be applied always when calorimeter and tof information is ambiguous.
+             // Tracker check will be applied always when calorimeter and tof information is ambiguous.
-                         if(use_TRK){
+             if(use_TRK){
-                                 if(      tp->chi2 > 0 && tp->chi2 < ti->chi2 ) tp_score++ ;
+                 if(      tp->chi2 > 0 && tp->chi2 < ti->chi2 ) tp_score++ ;
-                                 else if( ti->chi2 > 0 && ti->chi2 < tp->chi2 ) ti_score++ ;
+                 else if( ti->chi2 > 0 && ti->chi2 < tp->chi2 ) ti_score++ ;
-                         };
+ //              cout << "TRK "<<tp_score<<ti_score<<endl;
+             };
              // ------------------------
              // the winner is....
              // ------------------------
-                         if      (tp_score > ti_score) ts = tp;//the track sorted by the tracker!!
+             if      (tp_score > ti_score) {
-                         else if (tp_score < ti_score) ts = ti;//its image!!
+ //              ts = tp;//the track sorted by the tracker!!
-                         else {
+ //              cs = cp;
-                                 ts = tp;
+ //              os = op;
- //                              cout << "Warning - track image ambiguity not solved" << endl;
+             }else if (tp_score < ti_score) {
- //                              cout << ts->GetNtot() << " "<< ts->chi2 << " " << npcfit[1] << " "<< nphit_p << endl;
+                 ts = ti;//its image!!
-                         };
+                 cs = ci;
+                 os = oi;
+                 ti = tp;//its image!!
+                 ci = cp;
+                 oi = op;
+                 tp = ts;//its image!!
+                 cp = cs;
+                 op = os;
-                 }else{
-                         ts = tp;
-                 };
- //              cout <<" SortTracks() "<<i<<" -- "<<ts<<endl;
-                 sorted_tracks->Add(ts);//save the track in the sorted array
- //              cout << "SortTracks:: sorted_tracks->Add(it) "<<i<<" "<<ts<<endl;
+             }else {
+ //              ts = tp;
+ //              cs = cp;
+ //              os = op;
+ //                              cout << "Warning - track image ambiguity not solved" << endl;
+ //                              cout << ts->GetNtot() << " "<< ts->chi2 << " " << npcfit[1] << " "<< nphit_p << endl;
+             };
+         }else{
+ //          ts = tp;
+ //          cs = cp;
+ //          os = op;
          };
-   //Restore Object count
-   //To save space in the table keeping track of all referenced objects
+ //      cout <<" SortTracks() "<<i<<" -- "<<ts<<endl;
-   //we assume that our events do not address each other. We reset the
+ //      sorted_tracks->Add(ts);//save the track in the sorted array
-   //object count to what it was at the beginning of the event.
+ //      sorted_tracks.Add(ts);//save the track in the sorted array
-         TProcessID::SetObjectCount(ObjectNumber);
+ //      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);
+         new(ttimage[i])  PamTrack(ti,ci,oi);
+     };
+     if( tsorted->GetEntries() != trk2_obj->GetNTracks() ){
+         cout << "void PamLevel2::SortTracks(TString how): tsorted->GetEntries() "<<tsorted->GetEntries()<<" != trk2_obj->GetNTracks() = "<<trk2_obj->GetNTracks() <<endl;
+         tsorted->Delete(); tsorted=0;
+         timage->Delete(); timage=0;
+     }
+     //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);
  };
  //--------------------------------------
  //
-Line 379 
 void PamLevel2::SortTracks(TString how){
+Line 630 
 void PamLevel2::SortTracks(TString how){
   * 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(){
+ // TRefArray *PamLevel2::GetTracks(){
-          //
- //      SortTracks("+CAL+TOF");
+ // //  *-*-*-*-*-*-*-*-*-*-*-*-*
-          SortTracks("+CAL+TRK");//TEMP!!!!!!!!!!!!!
+ //     SortTracks("+CAL+TOF");
-         //
+ // //  *-*-*-*-*-*-*-*-*-*-*-*-*
-         return sorted_tracks;
+ // //   return  sorted_tracks;
+ //     return &sorted_tracks;
+ //  };
+ TClonesArray *PamLevel2::GetTracks(){
+ //  *-*-*-*-*-*-*-*-*-*-*-*-*
+     SortTracks("+CAL+TOF");
+ //  *-*-*-*-*-*-*-*-*-*-*-*-*
+     return tsorted;
   };
  //--------------------------------------
   //
-Line 396 
 void PamLevel2::SortTracks(TString how){
+Line 659 
 void PamLevel2::SortTracks(TString how){
   * @param it Track number, ranging from 0 to GetNTracks().
   */
  PamTrack *PamLevel2::GetTrack(int it){
+ //    if(!trk2_obj) return 0;
- //  *-*-*-*-*-*-*
+ // //  *-*-*-*-*-*-*-*-*-*-*-*-*
- //      SortTracks("+CAL+TOF");
+ //     SortTracks("+CAL+TOF");
-         SortTracks("+CAL+TRK");//TEMP!!!!!!!!!!!!!
+ // //  *-*-*-*-*-*-*-*-*-*-*-*-*
- //  *-*-*-*-*-*-*
+ // //    if(!sorted_tracks)return 0;
+ //     if(sorted_tracks.IsEmpty())return 0;
-         PamTrack *track = 0;
+ //     PamTrack *track = 0;
-         if( it >=0 && it < TrkLevel2::GetNTracks() ){
-                 TrkTrack   *t = (TrkTrack*)sorted_tracks->At(it);
+ //     if( it >=0 && it < trk2_obj->TrkLevel2::GetNTracks() && it<sorted_tracks.GetEntriesFast() ){
- //              cout << "GetTrack(int it):: sorted_tracks->At(it) "<<it<<" "<<t<<endl;
+ //      TrkTrack   *t = (TrkTrack*)sorted_tracks.At(it);
-                 track = GetPamTrackAlong(t);
+ //      track = GetPamTrackAlong(t);
-         }else{
+ //     }else{
-                 cout << "PamLevel2::GetTrack(int) : tracker track SeqNo "<< it <<" does not exist (GetNTracks() = "<<TrkLevel2::GetNTracks()<<")"<<endl;
+ //      cout << "PamLevel2::GetTrack(int) : tracker track SeqNo "<< it <<" does not exist (GetNTracks() = "<<trk2_obj->TrkLevel2::GetNTracks()<<")"<<endl;
-         };
+ //     };
-         return track;
+ //     return track;
+ //    cout << "PamLevel2::GetTrack(int it) "<<endl;
+ //  *-*-*-*-*-*-*-*-*-*-*-*-*
+     SortTracks("+CAL+TOF");
+ //  *-*-*-*-*-*-*-*-*-*-*-*-*
+     if(!tsorted)return 0;
+     if(!tsorted->GetEntries())return 0;
+     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];
+     }else{
+         cout << "PamLevel2::GetTrack(int) : tracker track SeqNo "<< it <<" does not exist (GetNTracks() = "<<trk2_obj->TrkLevel2::GetNTracks()<<")"<<endl;
+     };
+     return track;
  };
  //--------------------------------------
-Line 426 
 PamTrack *PamLevel2::GetTrack(int it){
+Line 712 
 PamTrack *PamLevel2::GetTrack(int it){
   */
  PamTrack *PamLevel2::GetTrackImage(int it){
- //      SortTracks("+CAL+TOF");
+ //     if(!trk2_obj) return 0;
-         SortTracks("+CAL+TRK");//TEMP!!!!!!!!!!!!!
-         PamTrack *image = 0;
-         if( it >=0 && it < TrkLevel2::GetNTracks() ){
+ // //  *-*-*-*-*-*-*-*-*-*-*-*-*
-                 TrkTrack *temp = (TrkTrack*)sorted_tracks->At(it);
+ //     SortTracks("+CAL+TOF");
-                 if( temp->HasImage() ){
+ // //  *-*-*-*-*-*-*-*-*-*-*-*-*
-                         TrkTrack   *t = TrkLevel2::GetStoredTrack(temp->GetImageSeqNo());
+ // //    if(!sorted_tracks)return 0;
-                         image = GetPamTrackAlong(t);
+ //     if(sorted_tracks.IsEmpty())return 0;
-                 }else{
-                         cout <<"PamLevel2::GetTrackImage(int) : Track SeqNo "<<it<<" does not have image"<<endl;
+ //     PamTrack *image = 0;
-                 };
+ //     if( it >=0 && it < trk2_obj->TrkLevel2::GetNTracks() ){
+ //      TrkTrack *temp = (TrkTrack*)sorted_tracks.At(it);
+ //      if( temp->HasImage() ){
+ //          TrkTrack   *t = trk2_obj->TrkLevel2::GetStoredTrack(temp->GetImageSeqNo());
+ //          image = GetPamTrackAlong(t);
+ //      }else{
+ //          cout <<"PamLevel2::GetTrackImage(int) : Track SeqNo "<<it<<" does not have image"<<endl;
+ //      };
+ //     }else{
+ //      cout << "PamLevel2::GetTrackImage(int) : Tracker track SeqNo "<< it <<" does not exist (GetNTracks() = "<<trk2_obj->TrkLevel2::GetNTracks()<<")"<<endl;
+ //     };
+ //     return image;
+ //  *-*-*-*-*-*-*-*-*-*-*-*-*
+     SortTracks("+CAL+TOF");
+ //  *-*-*-*-*-*-*-*-*-*-*-*-*
+     if(!timage)return 0;
+     if(!timage->GetEntries())return 0;
+     PamTrack *image = 0;
+     if( it >=0 && it < trk2_obj->TrkLevel2::GetNTracks() ){
+         TClonesArray &t = *(tsorted);
+         PamTrack *temp = (PamTrack*)t[it];
+         if( temp->GetTrkTrack()->HasImage() ){
+             TClonesArray &t = *(timage);
+             image = (PamTrack*)t[it];
          }else{
-                 cout << "PamLevel2::GetTrackImage(int) : Tracker track SeqNo "<< it <<" does not exist (GetNTracks() = "<<TrkLevel2::GetNTracks()<<")"<<endl;
+ //          cout <<"PamLevel2::GetTrackImage(int) : Track SeqNo "<<it<<" does not have image"<<endl;
          };
+     }else{
+         cout << "PamLevel2::GetTrackImage(int) : Tracker track SeqNo "<< it <<" does not exist (GetNTracks() = "<<trk2_obj->TrkLevel2::GetNTracks()<<")"<<endl;
+     };
-         return image;
+     return image;
  }
  //--------------------------------------
-Line 456 
 PamTrack *PamLevel2::GetTrackImage(int i
+Line 771 
 PamTrack *PamLevel2::GetTrackImage(int i
   * @param detlist String to select trees to be included
   * @return Pointer to a TTree
   */
- TTree *PamLevel2::GetPamTree(TFile *f, TString detlist="+ALL"){
+ TTree *PamLevel2::GetPamTree(TFile *f, TString detlist ){
+ //     if( !detlist.IsNull() ) SetWhichTrees(detlist);
+ //     else                    GetWhichTrees(f);
+     SetWhichTrees(detlist);
+     TTree *Trout =0;
+     TString fname = f->GetName();
+     if(!CheckLevel2File(fname))return NULL;
+     UInt_t *found=0;
+     cout<< "GetPamTree(TFile*,TString): detector list --> ";
+     if(TRK1)cout<<"TRK1 ";
+     if(TRK2)cout<<"TRK2 ";
+     if(TRKh)cout<<"TRKH ";
+     if(CAL1)cout<<"CAL1 ";
+     if(CAL2)cout<<"CAL2 ";
+     if(TOF)cout<<"TOF ";
+     if(TRG)cout<<"TRG ";
+     if(AC)cout<<"AC ";
+     if(ND)cout<<"ND ";
+     if(S4)cout<<"S4 ";
+     if(ORB)cout<<"ORB ";
+     cout << endl;
+     f->cd();
- //      cout << "WARNING!!! -- obsolete method -- \n";
- //      cout << "better use TChain *PamLevel2::GetPamTree(TList*, TString) \n";
-         TTree *Trout =0;
-         SetWhichTrees(detlist);
  // Tracker
      TTree *T = (TTree*)f->Get("Tracker");
-     if(T && TRK) {
+     if(T && (TRK2||TRK1||TRKh)) {
-                 if(TRK_L1){
+         if(TRK2)T->SetBranchAddress("TrkLevel2", GetPointerTo("TrkLevel2"));
-                         T->SetBranchAddress("TrkLevel1", GetPointerToTrk(1));
+         else    T->SetBranchStatus("TrkLevel2",0,found);
-                         cout << "Tracker      : set branch address TrkLevel1"<<endl;
+         if(TRK2)cout << "Tracker      : set branch address TrkLevel2"<<endl;
-                 };
+         if(TRK1)T->SetBranchAddress("TrkLevel1", GetPointerTo("TrkLevel1"));
-                 T->SetBranchAddress("TrkLevel2", GetPointerToTrk(2));
+         else    T->SetBranchStatus("TrkLevel1",0,found);
-                 cout << "Tracker      : set branch address TrkLevel2"<<endl;
+         if(TRK1)cout << "Tracker      : set branch address TrkLevel1"<<endl;
-                 Trout=T;
+         if(TRKh)T->SetBranchAddress("TrkHough", GetPointerTo("TrkHough"));
+         else    T->SetBranchStatus("TrkHough",0,found);
+         if(TRKh)cout << "Tracker      : set branch address TrkHough"<<endl;
+         if(!Trout)Trout=T;
+         else Trout->AddFriend(T);
      }else{
          cout << "Tracker      : missing tree"<<endl;
      };
      // Calorimeter
      TTree *C = (TTree*)f->Get("Calorimeter");
-     if(C && CAL) {
+     if(C && (CAL2||CAL1)) {
-         C->SetBranchAddress("CaloLevel2", GetPointerToCalo());
+         if(CAL2)C->SetBranchAddress("CaloLevel2", GetPointerTo("CaloLevel2"));
-         cout << "Calorimeter  : set branch address CaloLevel2"<<endl;
+         else    C->SetBranchStatus("CaloLevel2",0,found);
+         if(CAL2)cout << "Calorimeter  : set branch address CaloLevel2"<<endl;
+         if(CAL1)C->SetBranchAddress("CaloLevel1", GetPointerTo("CaloLevel1"));
+         else    C->SetBranchStatus("CaloLevel1",0,found);
+         if(CAL1)cout << "Calorimeter  : set branch address CaloLevel1"<<endl;
          if(!Trout)Trout=C;
          else Trout->AddFriend(C);
      }else{
          cout << "Calorimeter  : missing tree"<<endl;
      };
      // ToF
      TTree *O = (TTree*)f->Get("ToF");
      if(O && TOF) {
-         O->SetBranchAddress("ToFLevel2", GetPointerToToF());
+         O->SetBranchAddress("ToFLevel2", GetPointerTo("ToFLevel2"));
          cout << "ToF          : set branch address ToFLevel2"<<endl;
          if(!Trout)Trout=O;
          else Trout->AddFriend(O);
-Line 500 
 TTree *PamLevel2::GetPamTree(TFile *f, T
+Line 845 
 TTree *PamLevel2::GetPamTree(TFile *f, T
      // Trigger
      TTree *R = (TTree*)f->Get("Trigger");
      if(R && TRG) {
-         R->SetBranchAddress("TrigLevel2", GetPointerToTrig());
+         R->SetBranchAddress("TrigLevel2", GetPointerTo("TrigLevel2"));
          cout << "Trigger      : set branch address TrigLevel2"<<endl;
          if(!Trout)Trout=O;
          else Trout->AddFriend(R);
-Line 510 
 TTree *PamLevel2::GetPamTree(TFile *f, T
+Line 855 
 TTree *PamLevel2::GetPamTree(TFile *f, T
      // S4
      TTree *S = (TTree*)f->Get("S4");
      if(S && S4) {
-         S->SetBranchAddress("S4Level2", GetPointerToS4());
+         S->SetBranchAddress("S4Level2", GetPointerTo("S4Level2"));
          cout << "S4           : set branch address S4Level2"<<endl;
          if(!Trout)Trout=O;
          else Trout->AddFriend(S);
-Line 520 
 TTree *PamLevel2::GetPamTree(TFile *f, T
+Line 865 
 TTree *PamLevel2::GetPamTree(TFile *f, T
      // Neutron Detector
      TTree *N = (TTree*)f->Get("NeutronD");
      if(N && ND) {
-         N->SetBranchAddress("NDLevel2", GetPointerToND());
+         N->SetBranchAddress("NDLevel2", GetPointerTo("NDLevel2"));
          cout << "NeutronD     : set branch address NDLevel2"<<endl;
          if(!Trout)Trout=O;
          else Trout->AddFriend(N);
-Line 530 
 TTree *PamLevel2::GetPamTree(TFile *f, T
+Line 875 
 TTree *PamLevel2::GetPamTree(TFile *f, T
      // Anticounters
      TTree *A = (TTree*)f->Get("Anticounter");
      if(A && AC) {
-         A->SetBranchAddress("AcLevel2", GetPointerToAc());
+         A->SetBranchAddress("AcLevel2", GetPointerTo("AcLevel2"));
          cout << "Anticounter  : set branch address AcLevel2"<<endl;
          if(!Trout)Trout=O;
          else Trout->AddFriend(A);
-Line 538 
 TTree *PamLevel2::GetPamTree(TFile *f, T
+Line 883 
 TTree *PamLevel2::GetPamTree(TFile *f, T
          cout << "Anticounter  : missing tree"<<endl;
      };
      // Orbital Info
-         TTree *B = (TTree*)f->Get("OrbitalInfo");
+     TTree *B = (TTree*)f->Get("OrbitalInfo");
-         if(B && ORB) {
+     if(B && ORB) {
-                 B->SetBranchAddress("OrbitalInfo", GetPointerToOrb());
+         B->SetBranchAddress("OrbitalInfo", GetPointerTo("OrbitalInfo"));
-                 cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
+         cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
-                 if(!Trout)Trout=O;
+         if(!Trout)Trout=O;
-                 else Trout->AddFriend(B);
+         else Trout->AddFriend(B);
-         }else{
+     }else{
-                 cout << "OrbitalInfo  : missing tree"<<endl;
+         cout << "OrbitalInfo  : missing tree"<<endl;
-         };
+     };
-         cout<<endl<<" Number of entries: "<<Trout->GetEntries()<<endl<<endl;
+     cout<<endl<<" Number of entries: "<<Trout->GetEntries()<<endl<<endl;
-         return Trout;
+     return Trout;
  }
  //--------------------------------------
-Line 566 
 TTree *PamLevel2::GetPamTree(TFile *f, T
+Line 911 
 TTree *PamLevel2::GetPamTree(TFile *f, T
   */
  TList*  PamLevel2::GetListOfLevel2Files(TString ddir, TString flisttxt = ""){
-         TString wdir = gSystem->WorkingDirectory();
+     TString wdir = gSystem->WorkingDirectory();
-         if(ddir=="")ddir = wdir;
+     if(ddir=="")ddir = wdir;
  //      TSystemDirectory *datadir = new TSystemDirectory(gSystem->BaseName(ddir),ddir);
-         cout << "Level2 data directory : "<<  ddir << endl;
+     cout << "Level2 data directory : "<<  ddir << endl;
-         TList *contents  = new TList; // create output list
+     TList *contents  = new TList; // create output list
-         contents->SetOwner();
+     contents->SetOwner();
+ //    char *fullpath;
+ //    const char *fullpath;
+     // if no input file list is given:
+     if ( flisttxt != "" ){
-         char *fullpath;
+ //      if( !gSystem->IsFileInIncludePath(flisttxt,&fullpath) ){
+ //      if( !(fullpath = gSystem->FindFile("./",flisttxt)) ){
-         // if no input file list is given:
+ //          cout <<"File "<<flisttxt<<" not found"<<endl;
-         if ( flisttxt != "" ){
+ //          return 0;
+ //      }
-                 if( !gSystem->IsFileInIncludePath(flisttxt,&fullpath) )return 0;
+ //      flisttxt = fullpath;
- //              flisttxt = gSystem->ConcatFileName(gSystem->DirName(flisttxt),gSystem->BaseName(flisttxt));
+         flisttxt = gSystem->ConcatFileName(gSystem->DirName(flisttxt),gSystem->BaseName(flisttxt));
-                 flisttxt = fullpath;
+         if( !gSystem->ChangeDirectory(ddir) ){
-                 if( !gSystem->ChangeDirectory(ddir) )return 0;
+             cout << "Cannot change directory : "<<ddir<<endl;
+             return 0;
+         }
-                 cout <<"Input file list : " << flisttxt <<endl;
+         cout <<"Input file list : " << flisttxt <<endl;
-                 ifstream in;
+         ifstream in;
-                 in.open(flisttxt, ios::in); //open input file list
+         in.open(flisttxt, ios::in); //open input file list
-                 while (1) {
+         if(!in.good()){
-                         TString file;
+             cout <<" ERROR opening the file "<<endl;
-                         in >> file;
+             gSystem->ChangeDirectory(wdir); // back to the working directory
-                         if (!in.good()) break;
+             return 0;
-                         if( gSystem->IsFileInIncludePath(file,&fullpath) ){
+         }
- //                              contents->Add(new TSystemDirectory(fullpath,ddir)); // add file to the list
+         int line=0;
- //                              contents->Add(new TSystemFile(fullpath,ddir)); // add file to the list
+         while (1) {
-                                 contents->Add(new TSystemFile(fullpath,gSystem->DirName(fullpath)));// add file to the list
+             TString file;
-                         }else{
+             in >> file;
-                                 cout << "warning! --- File "<<file<<" does not exists"<< endl;
+             if (!in.good()) break;
-                         };
+             line++;
-                 };
+ //          cout <<"(1) " << file << endl;
-                 in.close();
+             if(file.IsNull()){
+                 cout << "-- list interrupted at line "<<line <<endl;
-         }else{
+                 break;
+             }
+             if(file.Contains("#"))file = file(0,file.First("#"));
+ //          cout <<"(2) " << file << endl;
+ //          if( gSystem->IsFileInIncludePath(file,&fullpath) ){
+ //          if( (fullpath = gSystem->FindFile(ddir,file)) ){
+             if( file.EndsWith(".root") ){
+                 char *fullpath = gSystem->ConcatFileName(gSystem->DirName(ddir),gSystem->BaseName(file));
+                 contents->Add(new TSystemFile(fullpath,gSystem->DirName(fullpath)));// add file to the list
+                 delete fullpath;
+             }
+ //          }else{
+ //              if(file.Data()!="")cout << "File: "<<file<<" ---> missing "<< endl;
+ //          };
+         };
+         in.close();
+     }else{
-                 cout << "No input file list given."<<endl;
+         cout << "No input file list given."<<endl;
-                 cout << "Check for existing root files."<<endl;
+         cout << "Check for existing root files."<<endl;
  //              cout << "Warking directory: "<< gSystem->WorkingDirectory()<< endl;
-                 TSystemDirectory *datadir = new TSystemDirectory(gSystem->BaseName(ddir),ddir);
+         TSystemDirectory *datadir = new TSystemDirectory(gSystem->BaseName(ddir),ddir);
-                 TList *temp = datadir->GetListOfFiles();
+         TList *temp = datadir->GetListOfFiles();
  //              temp->Print();
  //              cout << "*************************************" << endl;
-                 TIter next(temp);
-                 TSystemFile *questo = 0;
-                 while ( (questo = (TSystemFile*) next()) ) {
-                         TString name =  questo-> GetName();
-                         if( name.EndsWith(".root") ){
-                                 char *fullpath;
-                                 gSystem->IsFileInIncludePath(name,&fullpath);
-                                 contents->Add(new TSystemFile(fullpath,gSystem->DirName(fullpath)));
-                         };
-                 }
-                 delete temp;
-                 delete datadir;
-         };
+         TIter next(temp);
-         gSystem->ChangeDirectory(wdir); // back to the working directory
+         TSystemFile *questo = 0;
+         while ( (questo = (TSystemFile*) next()) ) {
+             TString name =  questo-> GetName();
+             if( name.EndsWith(".root") ){
+ //              const char *fullpath = gSystem->FindFile(ddir,name);
+ //              char *fullpath;
+ //              gSystem->IsFileInIncludePath(name,&fullpath);
+                 char *fullpath = gSystem->ConcatFileName(gSystem->DirName(ddir),gSystem->BaseName(name));
+                 contents->Add(new TSystemFile(fullpath,gSystem->DirName(fullpath)));
+                 delete fullpath;
+             };
+         }
+         delete temp;
+         delete datadir;
+     };
+     gSystem->ChangeDirectory(wdir); // back to the working directory
  //      cout << endl << "Selected files:" << endl;
  //      contents->Print();
-         cout << contents->GetEntries()<<" files selected\n";
+     cout << contents->GetEntries()<<" files \n";
  //      cout << endl;
  //      cout << "Working directory: "<< gSystem->WorkingDirectory()<< endl;
-         return contents;
+     return contents;
  };
  //--------------------------------------
  //
-Line 649 
 TList*  PamLevel2::GetListOfLevel2Files(
+Line 1022 
 TList*  PamLevel2::GetListOfLevel2Files(
   * @param detlist String to select trees to be included
   * @return Pointer to a TChain
   */
- TChain *PamLevel2::GetPamTree(TList *fl, TString detlist="+ALL"){
+ TChain *PamLevel2::GetPamTree(TList *fl, TString detlist ){
+     TChain *Trout =0;
- //      TChain *Tout=0;
+ //    if( !detlist.IsNull() )SetWhichTrees(detlist);
-         if(Tout)Tout->Delete();
+     SetWhichTrees(detlist);
-         Tout = NULL;
+     cout<< "GetPamTree(TList*,TString): input detector list --> ";
-         SetWhichTrees(detlist);
+     if(TRK1)cout<<"TRK1 ";
+     if(TRK2)cout<<"TRK2 ";
-         TChain *T = 0;
+     if(TRKh)cout<<"TRKH ";
-         TChain *C = 0;
+     if(CAL1)cout<<"CAL1 ";
-         TChain *O = 0;
+     if(CAL2)cout<<"CAL2 ";
-         TChain *R = 0;
+     if(TOF)cout<<"TOF ";
-         TChain *S = 0;
+     if(TRG)cout<<"TRG ";
-         TChain *N = 0;
+     if(AC)cout<<"AC ";
-         TChain *A = 0;
+     if(ND)cout<<"ND ";
-         TChain *B = 0;
+     if(S4)cout<<"S4 ";
+     if(ORB)cout<<"ORB ";
-         if(TRK) T = new TChain("Tracker");
+     cout << endl;
-         if(CAL) C = new TChain("Calorimeter");
-         if(TOF) O = new TChain("ToF");
+     TChain *T = 0;
-         if(TRG) R = new TChain("Trigger");
+     TChain *C = 0;
-         if(S4)  S = new TChain("S4");
+     TChain *O = 0;
-         if(ND)  N = new TChain("NeutronD");
+     TChain *R = 0;
-         if(AC)  A = new TChain("Anticounter");
+     TChain *S = 0;
-         if(ORB) B = new TChain("OrbitalInfo");
+     TChain *N = 0;
+     TChain *A = 0;
-         // loop over files and create chains
+     TChain *B = 0;
-         TIter next(fl);
-         TSystemFile *questo = 0;
+     if(TRK2||TRK1||TRKh) T = new TChain("Tracker");
-         while ( (questo = (TSystemFile*) next()) ) {
+     if(CAL2||CAL1)       C = new TChain("Calorimeter");
-                 TString name =  questo->GetName();
+     if(TOF)              O = new TChain("ToF");
- //              cout << "File: "<< name << endl;
+     if(TRG)              R = new TChain("Trigger");
-                 if( CheckLevel2File(name) ){
+     if(S4)               S = new TChain("S4");
-                         if(TRK) T->Add(name);
+     if(ND)               N = new TChain("NeutronD");
-                         if(CAL) C->Add(name);
+     if(AC)               A = new TChain("Anticounter");
-                         if(TOF) O->Add(name);
+     if(ORB)              B = new TChain("OrbitalInfo");
-                         if(TRG) R->Add(name);
-                         if(S4)  S->Add(name);
+     // loop over files and create chains
-                         if(ND)  N->Add(name);
+     TIter next(fl);
-                         if(AC)  A->Add(name);
+     TSystemFile *questo = 0;
-                         if(ORB) B->Add(name);
+     while ( (questo = (TSystemFile*) next()) ) {
-                 };
+         TString name =  questo->GetName();
-         }
+         cout << "File: "<< name << endl;
+         if( CheckLevel2File(name) ){
-             // Tracker
+             if(TRK2||TRK1||TRKh) T->Add(name);
-         if(TRK) if(!Tout)Tout=T;
+             if(CAL1||CAL2)       C->Add(name);
+             if(TOF)              O->Add(name);
-         // Calorimeter
+             if(TRG)              R->Add(name);
-         if(CAL) {
+             if(S4)               S->Add(name);
-                 if(!Tout)Tout=C;
+             if(ND)               N->Add(name);
-                 else Tout->AddFriend("Calorimeter");
+             if(AC)               A->Add(name);
+             if(ORB)              B->Add(name);
          };
+     }
+     cout << "done chain \n";
+     UInt_t *found=0;
+ // Tracker
+     if(T && (TRK2||TRK1||TRKh)) {
+         if(TRK2)T->SetBranchAddress("TrkLevel2", GetPointerTo("TrkLevel2"));
+         else    T->SetBranchStatus("TrkLevel2",0,found);
+         if(TRK2)cout << "Tracker      : set branch address TrkLevel2"<<endl;
+         if(TRK1)T->SetBranchAddress("TrkLevel1", GetPointerTo("TrkLevel1"));
+         else    T->SetBranchStatus("TrkLevel1",0,found);
+         if(TRK1)cout << "Tracker      : set branch address TrkLevel1"<<endl;
+         if(TRKh)T->SetBranchAddress("TrkHough", GetPointerTo("TrkHough"));
+         else    T->SetBranchStatus("TrkHough",0,found);
+         if(TRKh)cout << "Tracker      : set branch address TrkHough"<<endl;
+         if(!Trout)Trout=T;
+         else Trout->AddFriend("Tracker");
+     }else{
+         cout << "Tracker      : missing tree"<<endl;
+     };
+     // Calorimeter
+     if(C && (CAL2||CAL1)) {
+         if(CAL2)C->SetBranchAddress("CaloLevel2", GetPointerTo("CaloLevel2"));
+         else    C->SetBranchStatus("CaloLevel2",0,found);
+         if(CAL2)cout << "Calorimeter  : set branch address CaloLevel2"<<endl;
+         if(CAL1)C->SetBranchAddress("CaloLevel1", GetPointerTo("CaloLevel1"));
+         else    C->SetBranchStatus("CaloLevel1",0,found);
+         if(CAL1)cout << "Calorimeter  : set branch address CaloLevel1"<<endl;
+         if(!Trout)Trout=C;
+         else Trout->AddFriend("Calorimeter");
+     }else{
+         cout << "Calorimeter  : missing tree"<<endl;
+     };
      // ToF
-         if(TOF) {
+     if(O && TOF) {
-                 if(!Tout)Tout=O;
+         O->SetBranchAddress("ToFLevel2", GetPointerTo("ToFLevel2"));
-                 else Tout->AddFriend("ToF");
+         cout << "ToF          : set branch address ToFLevel2"<<endl;
-         };
+         if(!Trout)Trout=O;
+         else Trout->AddFriend("ToF");
+     }else{
+         cout << "ToF         : missing tree"<<endl;
+     };
      // Trigger
-         if(TRG) {
+     if(R && TRG) {
-                 if(!Tout)Tout=O;
+         R->SetBranchAddress("TrigLevel2", GetPointerTo("TrigLevel2"));
-                 else Tout->AddFriend("Trigger");
+         cout << "Trigger      : set branch address TrigLevel2"<<endl;
-         };
+         if(!Trout)Trout=O;
+         else Trout->AddFriend("Trigger");
+     }else{
+         cout << "Trigger      : missing tree"<<endl;
+     };
      // S4
-         if(S4) {
+     if(S && S4) {
-                 if(!Tout)Tout=O;
+         S->SetBranchAddress("S4Level2", GetPointerTo("S4Level2"));
-                 else Tout->AddFriend("S4");
+         cout << "S4           : set branch address S4Level2"<<endl;
-         };
+         if(!Trout)Trout=O;
+         else Trout->AddFriend("S4");
+     }else{
+         cout << "S4           : missing tree"<<endl;
+     };
      // Neutron Detector
-         if(ND) {
+     if(N && ND) {
-                 if(!Tout)Tout=O;
+         N->SetBranchAddress("NDLevel2", GetPointerTo("NDLevel2"));
-                 else Tout->AddFriend("NeutronD");
+         cout << "NeutronD     : set branch address NDLevel2"<<endl;
-         };
+         if(!Trout)Trout=O;
-     // Anticounters
+         else Trout->AddFriend("NeutronD");
-         if(AC) {
+     }else{
-                 if(!Tout)Tout=O;
+         cout << "NeutronD     : missing tree"<<endl;
-                 else Tout->AddFriend("Anticounter");
+     };
-         };
+     // Anticounters
-     // OrbitalInfo
+     if(A && AC) {
-         if(ORB) {
+         A->SetBranchAddress("AcLevel2", GetPointerTo("AcLevel2"));
-                 if(!Tout)Tout=O;
+         cout << "Anticounter  : set branch address AcLevel2"<<endl;
-                 else Tout->AddFriend("OrbitalInfo");
+         if(!Trout)Trout=O;
-         };
+         else Trout->AddFriend("Anticounter");
+     }else{
-         cout<<endl<<" Number of entries: "<<Tout->GetEntries()<<endl<<endl;
+         cout << "Anticounter  : missing tree"<<endl;
+     };
-         PamLevel2::SetBranchAddress();
+     // Orbital Info
+     if(B && ORB) {
-         return Tout;
+         B->SetBranchAddress("OrbitalInfo", GetPointerTo("OrbitalInfo"));
+         cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
+         if(!Trout)Trout=O;
+         else Trout->AddFriend("OrbitalInfo");
+     }else{
+         cout << "OrbitalInfo  : missing tree"<<endl;
+     };
+ //    cout<<endl<<" Number of entries: "<<Trout->GetEntries()<<endl<<endl;
+ //     // Tracker
+ //     if(TRK2||TRK1||TRKh){
+ //      if(!Tout)Tout=T;
+ //      else Tout->AddFriend("Tracker");
+ //     }
+ //     // Calorimeter
+ //     if(CAL2||CAL1) {
+ //      if(!Tout)Tout=C;
+ //      else Tout->AddFriend("Calorimeter");
+ //     };
+ //     // ToF
+ //     if(TOF) {
+ //      if(!Tout)Tout=O;
+ //      else Tout->AddFriend("ToF");
+ //     };
+ //     // Trigger
+ //     if(TRG) {
+ //      if(!Tout)Tout=R;
+ //      else Tout->AddFriend("Trigger");
+ //     };
+ //     // S4
+ //     if(S4) {
+ //      if(!Tout)Tout=S;
+ //      else Tout->AddFriend("S4");
+ //     };
+ //     // Neutron Detector
+ //     if(ND) {
+ //      if(!Tout)Tout=N;
+ //      else Tout->AddFriend("NeutronD");
+ //     };
+ //     // Anticounters
+ //     if(AC) {
+ //      if(!Tout)Tout=A;
+ //      else Tout->AddFriend("Anticounter");
+ //     };
+ //     // OrbitalInfo
+ //     if(ORB) {
+ //      if(!Tout)Tout=B;
+ //      else Tout->AddFriend("OrbitalInfo");
+ //     };
+ //    cout<<endl<<" Number of entries: "<<Tout->GetEntries()<<endl<<endl;
+ //    if( Tout->GetEntries() )PamLevel2::SetBranchAddress( Tout );
+     return Trout;
  }
  //--------------------------------------
  //
  //
-Line 746 
 TChain *PamLevel2::GetPamTree(TList *fl,
+Line 1226 
 TChain *PamLevel2::GetPamTree(TList *fl,
  /**
   * Set branch addresses for Pamela friend trees
   */
- void PamLevel2::SetBranchAddress(){
+ void PamLevel2::SetBranchAddress(TTree *t){
+     TRK2    = TRK2 & t->GetBranchStatus("TrkLevel2");
+     TRK1    = TRK1 & t->GetBranchStatus("TrkLevel1");
+     TRKh    = TRKh & t->GetBranchStatus("TrkHough");
+     CAL2    = CAL2 & t->GetBranchStatus("CaloLevel2");
+     CAL1    = CAL1 & t->GetBranchStatus("CaloLevel1");
+     TOF    = TOF & t->GetBranchStatus("ToFLevel2");
+     TRG    = TRG & t->GetBranchStatus("TrigLevel2");
+     S4     = S4  & t->GetBranchStatus("S4Level2");
+     ND     = ND  & t->GetBranchStatus("NDLevel2");
+     AC     = AC  & t->GetBranchStatus("AcLevel2");
+     ORB    = ORB & t->GetBranchStatus("OrbitalInfo");
      // Tracker
-         if(TRK) {
+     if(TRK1) {
-                 if(TRK_L1){
+         t->SetBranchAddress("TrkLevel1", GetPointerTo("TrkLevel2"));
-                         Tout->SetBranchAddress("TrkLevel1", GetPointerToTrk(1));
+         cout << "Tracker      : set branch address TrkLevel1"<<endl;
-                         cout << "Tracker      : set branch address TrkLevel1"<<endl;
+     };
-                 };
+     if(TRK2) {
-                 Tout->SetBranchAddress("TrkLevel2", GetPointerToTrk(2));
+         t->SetBranchAddress("TrkLevel2", GetPointerTo("TrkLevel1"));
-                 cout << "Tracker      : set branch address TrkLevel2"<<endl;
+         cout << "Tracker      : set branch address TrkLevel2"<<endl;
-         };
+     };
+     if(TRKh) {
-         // Calorimeter
+         t->SetBranchAddress("TrkHough", GetPointerTo("TrkHough"));
-         if(CAL) {
+         cout << "Tracker      : set branch address TrkHough"<<endl;
-                 Tout->SetBranchAddress("CaloLevel2", GetPointerToCalo());
+     };
-                 cout << "Calorimeter  : set branch address CaloLevel2"<<endl;
-         };
+     // Calorimeter
+     if(CAL1) {
+         t->SetBranchAddress("CaloLevel1", GetPointerTo("CaloLevel1"));
+         cout << "Calorimeter  : set branch address CaloLevel1"<<endl;
+     };
+     if(CAL2) {
+         t->SetBranchAddress("CaloLevel2", GetPointerTo("CaloLevel2"));
+         cout << "Calorimeter  : set branch address CaloLevel2"<<endl;
+     };
      // ToF
-         if(TOF) {
+     if(TOF) {
-                 Tout->SetBranchAddress("ToFLevel2", GetPointerToToF());
+         t->SetBranchAddress("ToFLevel2", GetPointerTo("ToFLevel2"));
-                 cout << "ToF          : set branch address ToFLevel2"<<endl;
+         cout << "ToF          : set branch address ToFLevel2"<<endl;
-         };
+     };
      // Trigger
-         if(TRG) {
+     if(TRG) {
-                 Tout->SetBranchAddress("TrigLevel2", GetPointerToTrig());
+         t->SetBranchAddress("TrigLevel2", GetPointerTo("TrigLevel2"));
-                 cout << "Trigger      : set branch address TrigLevel2"<<endl;
+         cout << "Trigger      : set branch address TrigLevel2"<<endl;
-         };
+     };
      // S4
-         if(S4) {
+     if(S4) {
-                 Tout->SetBranchAddress("S4Level2", GetPointerToS4());
+         t->SetBranchAddress("S4Level2", GetPointerTo("S4Level2"));
-                 cout << "S4           : set branch address S4Level2"<<endl;
+         cout << "S4           : set branch address S4Level2"<<endl;
-         };
+     };
      // Neutron Detector
-         if(ND) {
+     if(ND) {
-                 Tout->SetBranchAddress("NDLevel2", GetPointerToND());
+         t->SetBranchAddress("NDLevel2", GetPointerTo("NDLevel2"));
-                 cout << "NeutronD     : set branch address NDLevel2"<<endl;
+         cout << "NeutronD     : set branch address NDLevel2"<<endl;
-         };
+     };
      // Anticounters
-         if(AC) {
+     if(AC) {
-                 Tout->SetBranchAddress("AcLevel2", GetPointerToAc());
+         t->SetBranchAddress("AcLevel2", GetPointerTo("AcLevel2"));
-                 cout << "Anticounter  : set branch address AcLevel2"<<endl;
+         cout << "Anticounter  : set branch address AcLevel2"<<endl;
-         };
+     };
      // OrbitalInfo
-         if(ORB) {
+     if(ORB) {
-                 Tout->SetBranchAddress("OrbitalInfo", GetPointerToOrb());
+         t->SetBranchAddress("OrbitalInfo", GetPointerTo("OrbitalInfo"));
-                 cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
+         cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
-         };
+     };
  }
+ /**
+  * Set branch addresses for Pamela friend trees
+  */
+ void PamLevel2::SetBranchAddress(TChain *t){
+     TRK2    = TRK2 & t->GetBranchStatus("TrkLevel2");
+     TRK1    = TRK1 & t->GetBranchStatus("TrkLevel1");
+     TRKh    = TRKh & t->GetBranchStatus("TrkHough");
+     CAL1    = CAL1 & t->GetBranchStatus("CaloLevel1");
+     CAL2    = CAL2 & t->GetBranchStatus("CaloLevel2");
+     TOF    = TOF & t->GetBranchStatus("ToFLevel2");
+     TRG    = TRG & t->GetBranchStatus("TrigLevel2");
+     S4     = S4  & t->GetBranchStatus("S4Level2");
+     ND     = ND  & t->GetBranchStatus("NDLevel2");
+     AC     = AC  & t->GetBranchStatus("AcLevel2");
+     ORB    = ORB & t->GetBranchStatus("OrbitalInfo");
+     // Tracker
+      if(TRK2) {
+         t->SetBranchAddress("TrkLevel2", GetPointerTo("TrkLevel2"));
+         cout << "Tracker      : set branch address TrkLevel2"<<endl;
+     };
+     if(TRK1) {
+         t->SetBranchAddress("TrkLevel1", GetPointerTo("TrkLevel1"));
+         cout << "Tracker      : set branch address TrkLevel1"<<endl;
+     };
+      if(TRKh) {
+         t->SetBranchAddress("TrkHough", GetPointerTo("TrkHough"));
+         cout << "Tracker      : set branch address TrkHough"<<endl;
+      };
+     // Calorimeter
+     if(CAL2) {
+         t->SetBranchAddress("CaloLevel2", GetPointerTo("CaloLevel2"));
+         cout << "Calorimeter  : set branch address CaloLevel2"<<endl;
+     };
+     if(CAL1) {
+         t->SetBranchAddress("CaloLevel1", GetPointerTo("CaloLevel1"));
+         cout << "Calorimeter  : set branch address CaloLevel1"<<endl;
+     };
+     // ToF
+     if(TOF) {
+         t->SetBranchAddress("ToFLevel2", GetPointerTo("ToFLevel2"));
+         cout << "ToF          : set branch address ToFLevel2"<<endl;
+     };
+     // Trigger
+     if(TRG) {
+         t->SetBranchAddress("TrigLevel2", GetPointerTo("TrigLevel2"));
+         cout << "Trigger      : set branch address TrigLevel2"<<endl;
+     };
+     // S4
+     if(S4) {
+         t->SetBranchAddress("S4Level2", GetPointerTo("S4Level2"));
+         cout << "S4           : set branch address S4Level2"<<endl;
+     };
+     // Neutron Detector
+     if(ND) {
+         t->SetBranchAddress("NDLevel2", GetPointerTo("NDLevel2"));
+         cout << "NeutronD     : set branch address NDLevel2"<<endl;
+     };
+     // Anticounters
+     if(AC) {
+         t->SetBranchAddress("AcLevel2", GetPointerTo("AcLevel2"));
+         cout << "Anticounter  : set branch address AcLevel2"<<endl;
+     };
+     // OrbitalInfo
+     if(ORB) {
+         t->SetBranchAddress("OrbitalInfo", GetPointerTo("OrbitalInfo"));
+         cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
+     };
+ }
- //--------------------------------------
- //
- //
- //--------------------------------------
- void *PamLevel2::GetPointerTo(const char* c ){
- //      cout << "objname "<< objname << endl;
-         TString objname = c;
-         if(!objname.CompareTo("TrkLevel1"))return &trk_l1_obj;
-         if(!objname.CompareTo("TrkLevel2"))return &trk_obj;
-         return NULL;
- };
  //--------------------------------------
  //
  //
-Line 819 
 void *PamLevel2::GetPointerTo(const char
+Line 1383 
 void *PamLevel2::GetPointerTo(const char
   */
  TChain *PamLevel2::GetRunTree(TList *fl){
-         TChain *R = new TChain("Run");
+     TChain *R = new TChain("Run");
-         // loop over files and create chains
+     // loop over files and create chains
-         TIter next(fl);
+     TIter next(fl);
-         TSystemFile *questo = 0;
+     TSystemFile *questo = 0;
-         while ( (questo = (TSystemFile*) next()) ) {
+     while ( (questo = (TSystemFile*) next()) ) {
-                 TString name =  questo->GetName();
+         TString name =  questo->GetName();
  //              cout << "File: "<< name << endl;
-                 if( CheckLevel2File(name) ){
+         if( CheckLevel2File(name) ){
-                         R->Add(name);
+             R->Add(name);
-                 };
+         };
-         }
+     }
-         R->SetBranchAddress("RunInfo", GetPointerToRun());
+     R->SetBranchAddress("RunInfo", GetPointerTo("RunInfo"));
-         cout << "Run         : set branch address RunInfo"<<endl;
+     cout << "Run         : set branch address RunInfo"<<endl;
+     R->SetBranchAddress("SoftInfo", GetPointerTo("SoftInfo")); // Emiliano
+     cout << "Software    : set branch address SoftInfo"<<endl; // Emiliano
-         return R;
+     return R;
  }
  //--------------------------------------
-Line 850 
 TChain *PamLevel2::GetRunTree(TList *fl)
+Line 1416 
 TChain *PamLevel2::GetRunTree(TList *fl)
  TTree *PamLevel2::GetRunTree(TFile *f){
-         TTree *R = (TTree*)f->Get("Run");
+     TTree *R = (TTree*)f->Get("Run");
-         R->SetBranchAddress("RunInfo", GetPointerToRun());
+     R->SetBranchAddress("RunInfo", GetPointerTo("RunInfo"));
-         cout << "Run         : set branch address RunInfo"<<endl;
+     cout << "Run         : set branch address RunInfo"<<endl;
+     R->SetBranchAddress("SoftInfo", GetPointerTo("SoftInfo")); // Emiliano
+     cout << "Software    : set branch address SoftInfo"<<endl; // Emiliano
-         return R;
+     return R;
  }
+ /**
+  * 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, ULong64_t iev){
+   //
+   // check if we have already called once GetEntry, if not call it
+   //
+   if ( run->GetEntries() <= 0 ) return(false);
+   //
+   Int_t oldrun = irun;
+   if ( irun < 0 ){
+     irun = 0;
+     run->GetEntry(0);
+     runfirstentry = 0ULL;
+     runlastentry += (ULong64_t)(this->GetRunInfo()->NEVENTS) - 1ULL;
+   };
+   while ( iev > (runfirstentry+(ULong64_t)(this->GetRunInfo()->NEVENTS-1)) && irun < run->GetEntries() ){
+     //    printf(" iev %llu %u %llu \n",iev,this->GetRunInfo()->NEVENTS,(ULong64_t)(runfirstentry+(ULong64_t)(this->GetRunInfo()->NEVENTS)));
+     irun++;
+     run->GetEntry(irun);
+     runfirstentry = runlastentry+1ULL;
+     runlastentry += (ULong64_t)(this->GetRunInfo()->NEVENTS);
+   };
+   //
+   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);
+   //
+   return(true);
+   //
+ };
+ /**
+  * 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(TTree *run, ULong64_t iev){
+   return(UpdateRunInfo((TChain*)run,iev));
+ };
  //--------------------------------------
  //
  //
  //--------------------------------------
  /**
-  * Set which trees should be analysed
+  * Set which trees shoul be analysed
   * @param detlist TString containing the sequence of trees required
  */
  void PamLevel2::SetWhichTrees(TString detlist){
-         if(detlist.Contains("+ALL", TString::kIgnoreCase)){
+     if(detlist.IsNull() || detlist.Contains("+ALL", TString::kIgnoreCase)){
-                 CAL = true;
+         CAL1 = true;
-                 TRK = true;
+         CAL2 = true;
-                 TRK_L1 = false;
+         TRK2 = true;
-                 TRG = true;
+         TRK1 = false;
-                 TOF = true;
+         TRKh = false;
-                 S4  = true;
+         TRG = true;
-                 ND  = true;
+         TOF = true;
-                 AC  = true;
+         S4  = true;
-                 ORB = true;
+         ND  = true;
-         }else if( detlist.Contains("-ALL", TString::kIgnoreCase) ){
+         AC  = true;
-                 CAL = false;
+         ORB = true;
-                 TRK = false;
+     }else if( detlist.Contains("-ALL", TString::kIgnoreCase) ){
-                 TRK_L1 = false;
+         CAL1 = false;
-                 TRG = false;
+         CAL2 = false;
-                 TOF = false;
+         TRK2 = false;
-                 S4  = false;
+         TRK1 = false;
-                 ND  = false;
+         TRKh = false;
-                 AC  = false;
+         TRG = false;
-                 ORB = false;
+         TOF = false;
-         };
+         S4  = false;
+         ND  = false;
-         if( detlist.Contains("-CAL", TString::kIgnoreCase) )CAL = false;
+         AC  = false;
-         else if( detlist.Contains("+CAL", TString::kIgnoreCase) )CAL = true;
+         ORB = false;
+     };
-         if( detlist.Contains("-TRK", TString::kIgnoreCase) )TRK = false;
-         else if( detlist.Contains("+TRK", TString::kIgnoreCase) )TRK = true;
+ //  -------------------------------------------------------------------------
+     if( detlist.Contains("CAL1", TString::kIgnoreCase) ){
-         if( detlist.Contains("-TRK1", TString::kIgnoreCase) )TRK_L1 = false;
+         if ( detlist.Contains("-CAL1", TString::kIgnoreCase) )CAL1=false;
-         else if( detlist.Contains("+TRK1", TString::kIgnoreCase) )TRK_L1 = true;
+         if ( detlist.Contains("+CAL1", TString::kIgnoreCase) )CAL1=true;
+     };
-         if( detlist.Contains("-TRG", TString::kIgnoreCase) )TRG = false;
-         else if( detlist.Contains("+TRG", TString::kIgnoreCase) )TRG = true;
-         if( detlist.Contains("-TOF", TString::kIgnoreCase) )TOF = false;
+     if( detlist.Contains("CAL2", TString::kIgnoreCase)){
-         else if( detlist.Contains("+TOF", TString::kIgnoreCase) )TOF = true;
+         if ( detlist.Contains("-CAL2", TString::kIgnoreCase) )CAL2=false;
+         if ( detlist.Contains("+CAL2", TString::kIgnoreCase) )CAL2=true;
+     };
-         if( detlist.Contains("-S4",  TString::kIgnoreCase) )S4  = false;
+     if( detlist.Contains("+CAL", TString::kIgnoreCase) && !CAL1 && !CAL2 )CAL2=true;
-         else if( detlist.Contains("+S4",  TString::kIgnoreCase) )S4  = true;
+     if( detlist.Contains("-CAL", TString::kIgnoreCase) && CAL1 && CAL2 ){
+         CAL2=false;
+         CAL1=false;
+     }
+ //  -------------------------------------------------------------------------
+     if( detlist.Contains("TRK1", TString::kIgnoreCase) ){
+         if ( detlist.Contains("-TRK1", TString::kIgnoreCase) )TRK1=false;
+         if ( detlist.Contains("+TRK1", TString::kIgnoreCase) )TRK1=true;
+     };
-         if( detlist.Contains("-ND",  TString::kIgnoreCase) )ND  = false;
+     if( detlist.Contains("TRK2", TString::kIgnoreCase)){
-         else if( detlist.Contains("+ND",  TString::kIgnoreCase) )ND  = true;
+         if ( detlist.Contains("-TRK2", TString::kIgnoreCase) )TRK2=false;
+         if ( detlist.Contains("+TRK2", TString::kIgnoreCase) )TRK2=true;
+     };
+     if( detlist.Contains("TRKh", TString::kIgnoreCase)){
+         if ( detlist.Contains("-TRKh", TString::kIgnoreCase) )TRKh=false;
+         if ( detlist.Contains("+TRKh", TString::kIgnoreCase) )TRKh=true;
+     };
-         if( detlist.Contains("-AC",  TString::kIgnoreCase) )AC  = false;
+     if( detlist.Contains("+TRK", TString::kIgnoreCase) && !TRK1 && !TRK2 && !TRKh )TRK2=true;
-         else if( detlist.Contains("+AC",  TString::kIgnoreCase) )AC  = true;
+     if( detlist.Contains("-TRK", TString::kIgnoreCase) && TRK1 && TRK2 && TRKh){
+         TRK2=false;
+         TRK1=false;
+         TRKh=false;
+     }
+ //  -------------------------------------------------------------------------
+     if( detlist.Contains("-TRG", TString::kIgnoreCase) )TRG = false;
+     else if( detlist.Contains("+TRG", TString::kIgnoreCase) )TRG = true;
+     if( detlist.Contains("-TOF", TString::kIgnoreCase) )TOF = false;
+     else if( detlist.Contains("+TOF", TString::kIgnoreCase) )TOF = true;
+     if( detlist.Contains("-S4",  TString::kIgnoreCase) )S4  = false;
+     else if( detlist.Contains("+S4",  TString::kIgnoreCase) )S4  = true;
+     if( detlist.Contains("-ND",  TString::kIgnoreCase) )ND  = false;
+     else if( detlist.Contains("+ND",  TString::kIgnoreCase) )ND  = true;
+     if( detlist.Contains("-AC",  TString::kIgnoreCase) )AC  = false;
+     else if( detlist.Contains("+AC",  TString::kIgnoreCase) )AC  = true;
+     if( detlist.Contains("-ORB", TString::kIgnoreCase) )ORB = false;
+     else if( detlist.Contains("+ORB", TString::kIgnoreCase) )ORB = true;
+ //     cout<< "Set detector list --> ";
+ //     if(TRK1)cout<<"TRK1 ";
+ //     if(TRK2)cout<<"TRK2 ";
+ //     if(TRKh)cout<<"TRKH ";
+ //     if(CAL1)cout<<"CAL1 ";
+ //     if(CAL2)cout<<"CAL2 ";
+ //     if(TOF)cout<<"TOF ";
+ //     if(TRG)cout<<"TRG ";
+ //     if(AC)cout<<"AC ";
+ //     if(ND)cout<<"ND ";
+ //     if(S4)cout<<"S4 ";
+ //     if(ORB)cout<<"ORB ";
+ //     cout << endl;
+ };
+ /**
+  * Set tree/branch detector flags from the content of a tree
+  */
+ void  PamLevel2::GetWhichTrees(TFile* f){
-         if( detlist.Contains("-ORB", TString::kIgnoreCase) )ORB = false;
+     // -----------
-         else if( detlist.Contains("+ORB", TString::kIgnoreCase) )ORB = true;
+     // reset flags
+     // -----------
+     CAL1   = false;
+     CAL2   = false;
+     TRK2   = false;
+     TRK1   = false;
+     TRKh   = false;
+     TRG    = false;
+     TOF    = false;
+     S4     = false;
+     ND     = false;
+     AC     = false;
+     ORB    = false;
+     RUN    = false;
+     cout << "Checking file: "<<f->GetName()<<endl;
+     if( !f || f->IsZombie() ){
+         cout << "File: "<< f->GetName() <<" Non valid root file"<< endl;
+         return;
+     }
+     TList *lk = f->GetListOfKeys();
+     TIter next(lk);
+     TKey *key =0;
+     Int_t nev = 0;
+     while( (key = (TKey*)next()) ){
+         if( !strcmp(key->GetName(),"Run"        ) )RUN = true;
+         //=========================================================
+         if( !strcmp(key->GetName(),"Trigger"    ) ){
+             TRG = true;
+             Int_t nevt = ((TTree*)f->Get("Trigger"))->GetEntries();
+             if( nev && nevt!=nev){
+                 cout << "File: "<< f->GetName() <<" Trigger tree has "<<nevt<<" events instead of "<<nev<< endl;
+                 TRG = false;
+             }else nev=nevt;
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"ToF"        ) ){
+             TOF = true;
+             Int_t nevt = ((TTree*)f->Get("ToF"))->GetEntries();
+             if( nev && nevt!=nev){
+                 cout << "File: "<< f->GetName() <<"     ToF tree has "<<nevt<<" events instead of "<<nev<< endl;
+                 TOF = false;
+             }else nev=nevt;
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"S4"         ) ){
+             S4 = true;
+             Int_t nevt = ((TTree*)f->Get("S4"))->GetEntries();
+             if( nev && nevt!=nev){
+                 cout << "File: "<< f->GetName() <<"      S4 tree has "<<nevt<<" events instead of "<<nev<< endl;
+                 S4 = false;
+             }else nev=nevt;
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"NeutronD"   ) ){
+             ND = true;
+             Int_t nevt = ((TTree*)f->Get("NeutronD"))->GetEntries();
+             if( nev && nevt!=nev){
+                 cout << "File: "<< f->GetName() <<"NeutronD tree has "<<nevt<<" events instead of "<<nev<< endl;
+                 ND =false;
+             }else nev=nevt;
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"Anticounter") ){
+             AC = true;
+             Int_t nevt = ((TTree*)f->Get("Anticounter"))->GetEntries();
+             if( nev && nevt!=nev){
+                 cout << "File: "<< f->GetName() <<" Anticounter tree has "<<nevt<<" events instead of "<<nev<< endl;
+                 AC =false;
+             }else nev=nevt;
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"OrbitalInfo") ){
+             ORB = true;
+             Int_t nevt = ((TTree*)f->Get("OrbitalInfo"))->GetEntries();
+             if( nev && nevt!=nev){
+                 cout << "File: "<< f->GetName() <<" OrbitalInfo tree has "<<nevt<<" events instead of "<<nev<< endl;
+                 ORB = false;
+             }else nev=nevt;
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"Tracker"    ) ){
+             TTree *T = (TTree*)f->Get("Tracker");
+             for(Int_t i=0; i<T->GetListOfBranches()->GetEntries(); i++){
+                 TString name = T->GetListOfBranches()->At(i)->GetName();
+                 if( !name.CompareTo("TrkLevel1") )TRK1=true;
+                 if( !name.CompareTo("TrkLevel2") )TRK2=true;
+                 if( !name.CompareTo("TrkHough") )TRKh=true;
+             };
+             Int_t nevt = T->GetEntries();
+             if( nev && nevt!=nev){
+                 cout << "File: "<< f->GetName() <<" Tracker tree has "<<nevt<<" events instead of "<<nev<< endl;
+                 TRK1 = false;
+                 TRK2 = false;
+                 TRKh = false;
+             }else nev=nevt;
+             T->Delete();
+         };
+         //=========================================================
+         if( !strcmp(key->GetName(),"Calorimeter"    ) ){
+             TTree *T = (TTree*)f->Get("Calorimeter");
+             for(Int_t i=0; i<T->GetListOfBranches()->GetEntries(); i++){
+                 TString name = T->GetListOfBranches()->At(i)->GetName();
+                 if( !name.CompareTo("CaloLevel1") )CAL1=true;
+                 if( !name.CompareTo("CaloLevel2") )CAL2=true;
+             };
+             Int_t nevt = T->GetEntries();
+             if( nev && nevt!=nev){
+                 cout << "File: "<< f->GetName() <<"  Calorimeter tree has "<<nevt<<" events instead of "<<nev<< endl;
+                 CAL1 = false;
+                 CAL2 = false;
+             }else nev=nevt;
+             T->Delete();
+         };
+     };
+     delete lk;
+ //     cout<< "Get detector list from input file --> ";
+ //     if(TRK1)cout<<"TRK1 ";
+ //     if(TRK2)cout<<"TRK2 ";
+ //     if(TRKh)cout<<"TRKH ";
+ //     if(CAL1)cout<<"CAL1 ";
+ //     if(CAL2)cout<<"CAL2 ";
+ //     if(TOF)cout<<"TOF ";
+ //     if(TRG)cout<<"TRG ";
+ //     if(AC)cout<<"AC ";
+ //     if(ND)cout<<"ND ";
+ //     if(S4)cout<<"S4 ";
+ //     if(ORB)cout<<"ORB ";
+ //     cout << endl;
+     return ;
  };
  //--------------------------------------
  //
  //
-Line 929 
 void PamLevel2::SetWhichTrees(TString de
+Line 1741 
 void PamLevel2::SetWhichTrees(TString de
   */
  Bool_t  PamLevel2::CheckLevel2File(TString name){
-         Bool_t CAL__ok = false;
+     Bool_t CAL1__ok   = false;
-         Bool_t TRK__ok = false;
+     Bool_t CAL2__ok   = false;
-         Bool_t TRK_L1__ok = false;
+     Bool_t TRK2__ok   = false;
-         Bool_t TRG__ok = false;
+     Bool_t TRK1__ok   = false;
-         Bool_t TOF__ok = false;
+     Bool_t TRKh__ok   = false;
-         Bool_t S4__ok  = false;
+     Bool_t TRG__ok    = false;
-         Bool_t ND__ok  = false;
+     Bool_t TOF__ok    = false;
-         Bool_t AC__ok  = false;
+     Bool_t S4__ok     = false;
-         Bool_t ORB__ok = false;
+     Bool_t ND__ok     = false;
+     Bool_t AC__ok     = false;
-         Bool_t RUN__ok = false;
+     Bool_t ORB__ok    = false;
-         TFile *f = new TFile(name.Data());
+     Bool_t RUN__ok    = false;
-         TList *lk = f->GetListOfKeys();
- //      lk->Print();
-         TIter next(lk);
-         TKey *key =0;
-         while( (key = (TKey*)next()) ){
- //              cout << key->GetName() << endl;
-                 if( !strcmp(key->GetName(),"Calorimeter") )CAL__ok = true;
- //              if( !strcmp(key->GetName(),"Tracker"    ) )TRK__ok = true;
-                 if( !strcmp(key->GetName(),"Trigger"    ) )TRG__ok = true;
-                 if( !strcmp(key->GetName(),"ToF"        ) )TOF__ok = true;
-                 if( !strcmp(key->GetName(),"S4"         ) )S4__ok = true;
-                 if( !strcmp(key->GetName(),"NeutronD"   ) )ND__ok = true;
-                 if( !strcmp(key->GetName(),"Anticounter") )AC__ok = true;
-                 if( !strcmp(key->GetName(),"OrbitalInfo") )ORB__ok = true;
-                 if( !strcmp(key->GetName(),"Run"        ) )RUN__ok = true;
-                 if( !strcmp(key->GetName(),"Tracker"    ) ){
-                         TRK__ok = true;
-                         TTree *T = (TTree*)f->Get("Tracker");
-                         for(Int_t i=0; i<T->GetListOfBranches()->GetEntries(); i++){
-                                 TString name = T->GetListOfBranches()->At(i)->GetName();
-                                 if( !name.CompareTo("TrkLevel1") )TRK_L1__ok=true;
-                         };
-                 };
-         };
+     cout << "Checking file: "<<name<<endl;
+     TFile *f = new TFile(name.Data());
-         lk->Delete();
+     if( !f || f->IsZombie() ){
-         f->Close();
+         cout << "File: "<< f->GetName() <<" discarded ---- Non valid root file"<< endl; return false;
+     }
+ //    cout << "Get list of keys: "<<f<<endl;
+     TList *lk = f->GetListOfKeys();
+ //    lk->Print();
+     TIter next(lk);
+     TKey *key =0;
+     Int_t nev = 0;
+     while( (key = (TKey*)next()) ){
+ //      cout << key->GetName() << ""<<key->GetClassName()<<endl;
+ //              cout << " Get tree: " << f->Get(key->GetName())<<endl;
+ //      nev_previous = nev;
+ //      cout << " n.entries  "<< nev <<endl;
+ //      if( key->GetClassName()=="TTree" && nev_previous && nev != nev_previous ){
+ //          nev = ((TTree*)f->Get(key->GetName()))->GetEntries();
+ //          cout << "File: "<< f->GetName() <<" discarded ---- "<< key->GetName() << " tree: n.entries does not match "<<nev<<" "<<nev_previous<< endl;
+ //          return false;
+ //      };
+         if( !strcmp(key->GetName(),"Run"        ) )RUN__ok = true;
+         //=========================================================
+         if( !strcmp(key->GetName(),"Trigger"    ) ){
+             TRG__ok = true;
+             if(TRG){
+                 Int_t nevt = ((TTree*)f->Get("Trigger"))->GetEntries();
+                 if( nev && nevt!=nev){
+                     cout << "File: "<< f->GetName() <<" discarded ---- Trigger tree has "<<nevt<<" events instead of "<<nev<< endl;
+                     return false;
+                 }
+                 nev=nevt;
+             }
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"ToF"        ) ){
+             TOF__ok = true;
+             if(TOF){
+                 Int_t nevt = ((TTree*)f->Get("ToF"))->GetEntries();
+                 if( nev && nevt!=nev){
+                     cout << "File: "<< f->GetName() <<" discarded ---- ToF tree has "<<nevt<<" events instead of "<<nev<< endl;
+                     return false;
+                 }
+                 nev=nevt;
+             }
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"S4"         ) ){
+             S4__ok = true;
+             if(S4){
+                 Int_t nevt = ((TTree*)f->Get("S4"))->GetEntries();
+                 if( nev && nevt!=nev){
+                     cout << "File: "<< f->GetName() <<" discarded ---- S4 tree has "<<nevt<<" events instead of "<<nev<< endl;
+                     return false;
+                 }
+                 nev=nevt;
+             }
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"NeutronD"   ) ){
+             ND__ok = true;
+             if(ND){
+                 Int_t nevt = ((TTree*)f->Get("NeutronD"))->GetEntries();
+                 if( nev && nevt!=nev){
+                     cout << "File: "<< f->GetName() <<" discarded ---- NeutronD tree has "<<nevt<<" events instead of "<<nev<< endl;
+                     return false;
+                 }
+                 nev=nevt;
+             }
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"Anticounter") ){
+             AC__ok = true;
+             if(AC){
+                 Int_t nevt = ((TTree*)f->Get("Anticounter"))->GetEntries();
+                 if( nev && nevt!=nev){
+                     cout << "File: "<< f->GetName() <<" discarded ---- Anticounter tree has "<<nevt<<" events instead of "<<nev<< endl;
+                     return false;
+                 }
+                 nev=nevt;
+             }
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"OrbitalInfo") ){
+             ORB__ok = true;
+             if(ORB){
+                 Int_t nevt = ((TTree*)f->Get("OrbitalInfo"))->GetEntries();
+                 if( nev && nevt!=nev){
+                     cout << "File: "<< f->GetName() <<" discarded ---- OrbitalInfo tree has "<<nevt<<" events instead of "<<nev<< endl;
+                     return false;
+                 }
+                 nev=nevt;
+             }
+         }
+         //=========================================================
+         if( !strcmp(key->GetName(),"Tracker"    ) ){
+             TTree *T = (TTree*)f->Get("Tracker");
+             if(TRK1||TRK2||TRKh){
+                 Int_t nevt = T->GetEntries();
+                 if( nev && nevt!=nev){
+                     cout << "File: "<< f->GetName() <<" discarded ---- Tracker tree has "<<nevt<<" events instead of "<<nev<< endl;
+                     return false;
+                 }
+                 nev=nevt;
+             }
+             for(Int_t i=0; i<T->GetListOfBranches()->GetEntries(); i++){
+                 TString name = T->GetListOfBranches()->At(i)->GetName();
+                 if( !name.CompareTo("TrkLevel1") )TRK1__ok=true;
+                 if( !name.CompareTo("TrkLevel2") )TRK2__ok=true;
+                 if( !name.CompareTo("TrkHough") )TRKh__ok=true;
+             };
+             T->Delete();
+         };
+         //=========================================================
+         if( !strcmp(key->GetName(),"Calorimeter"    ) ){
+             TTree *T = (TTree*)f->Get("Calorimeter");
+             if(CAL1||CAL2){
+                 Int_t nevt = T->GetEntries();
+                 if( nev && nevt!=nev){
+                     cout << "File: "<< f->GetName() <<" discarded ---- Calorimeter tree has "<<nevt<<" events instead of "<<nev<< endl;
+                     return false;
+                 }
+                 nev=nevt;
+             }
+             for(Int_t i=0; i<T->GetListOfBranches()->GetEntries(); i++){
+                 TString name = T->GetListOfBranches()->At(i)->GetName();
+                 if( !name.CompareTo("CaloLevel1") )CAL1__ok=true;
+                 if( !name.CompareTo("CaloLevel2") )CAL2__ok=true;
+             };
+             T->Delete();
+         };
+     };
+ //     cout<< "CheckLevel2File(TString): detector list --> ";
+ //     if(TRK1__ok)cout<<"TRK1 ";
+ //     if(TRK2__ok)cout<<"TRK2 ";
+ //     if(TRKh__ok)cout<<"TRKH ";
+ //     if(CAL1__ok)cout<<"CAL1 ";
+ //     if(CAL2__ok)cout<<"CAL2 ";
+ //     if(TOF__ok)cout<<"TOF ";
+ //     if(TRG__ok)cout<<"TRG ";
+ //     if(AC__ok)cout<<"AC ";
+ //     if(ND__ok)cout<<"ND ";
+ //     if(S4__ok)cout<<"S4 ";
+ //     if(ORB__ok)cout<<"ORB ";
+ //     cout << endl;
+     if(TRK2 && TRK1__ok)TRK1=1;
+ // ----------------------------------------------------------------------------
+ // NOTA
+ // se c'e` il level1, lo devo necessarimente leggere.
+ // infatti (non ho capito perche`) i cluster vengono letti e allocati in memoria
+ // comunque, ma non vengono disallocati da PamLevel2::Clear()
+ // ----------------------------------------------------------------------------
+     if(!RUN__ok) {
+         cout << "File: "<< f->GetName() <<" *WARNING* ---- Missing RunInfo tree"<< endl;
+ //      return false;
+     };
+     if(CAL1 && !CAL1__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing CaloLevel1 branch"<< endl;
+         return false;
+     };
+     if(CAL2 && !CAL2__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing CaloLevel2 branch"<< endl;
+         return false;
+     };
+     if(TRK2 && !TRK2__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing TrkLevel2 branch"<< endl;
+         return false;
+     };
+     if(TRK1 && !TRK1__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing TrkLevel1 branch"<< endl;
+         return false;
+     };
+     if(TRKh && !TRKh__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing TrkHough branch"<< endl;
+         return false;
+     };
+     if(ORB && !ORB__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing ORB tree"<< endl;
+         return false;
+     };
+     if(AC && !AC__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing AC tree"<< endl;
+         return false;
+     };
+     if(S4 && !S4__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing S4 tree"<< endl;
+         return false;
+     };
+     if(TOF && !TOF__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing ToF tree"<< endl;
+         return false;
+     };
+     if(ND && !ND__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing ND tree"<< endl;
+         return false;
+     };
+     if(TRG && !TRG__ok){
+         cout << "File: "<< f->GetName() <<" discarded ---- Missing Trigger tree"<< endl;
+         return false;
+     };
+ //    lk->Delete();
+ //    delete lk;
+     f->Close();
+ //     cout<< "CheckLevel2File(TString): detector list --> ";
+ //     if(TRK1)cout<<"TRK1 ";
+ //     if(TRK2)cout<<"TRK2 ";
+ //     if(TRKh)cout<<"TRKH ";
+ //     if(CAL1)cout<<"CAL1 ";
+ //     if(CAL2)cout<<"CAL2 ";
+ //     if(TOF)cout<<"TOF ";
+ //     if(TRG)cout<<"TRG ";
+ //     if(AC)cout<<"AC ";
+ //     if(ND)cout<<"ND ";
+ //     if(S4)cout<<"S4 ";
+ //     if(ORB)cout<<"ORB ";
+ //     cout << endl;
+     return true;
-         Bool_t FLAG = true;
+ };
-         if(!RUN__ok) {
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing RunInfo tree"<< endl;
-                 FLAG = false;
+ /**
-         };
+  * Create clone-trees
-         if(CAL && !CAL__ok){
+  */
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing Calorimeter tree"<< endl;
+ void PamLevel2::CreateCloneTrees0( TChain *fChain, TFile *ofile ){
-                 FLAG = false;
-         };
+     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
-         if(TRK && !TRK__ok){
+     cout << "Create clones of PAMELA trees "<<endl;
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing Tracker tree"<< endl;
-                 FLAG = false;
+     Int_t i=0;
-         };
+     tree_clone[i] = fChain->GetTree()->CloneTree(0);
-         if(TRK_L1 && !TRK_L1__ok){
+     TString name =  tree_clone[i]->GetName();
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing Tracker Level1 Branch"<< endl;
+     name.Append("_clone");
-                 FLAG = false;
+ //    tree_clone[i]->SetName(name.Data());
-         };
+     cout << tree_clone[i]->GetName() <<endl;
-         if(TRG && !TRG__ok){
+     i++;
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing Trigger tree"<< endl;
-                 FLAG = false;
+     TList *li = fChain->GetListOfFriends();
-         };
+     TIter next(li);
-         if(TOF && !TOF__ok){
+     TFriendElement* T_friend=0;
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing ToF tree"<< endl;
+     ofile->cd();
-                 FLAG = false;
+     while( (T_friend = (TFriendElement*)next()) ){
-         };
+ //      cout<<T_friend->IsA()->GetName()<<" "<<T_friend->GetName()<<hex << T_friend->GetTree() << dec<<endl;
-         if(S4 && !S4__ok){
+ //      cout<<T_friend->GetTree()->GetName()<< endl;
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing S4 tree"<< endl;
+         tree_clone[i] = T_friend->GetTree()->CloneTree(0);
-                 FLAG = false;
+         tree_clone[i]->SetAutoSave(1000000);
+         name =  tree_clone[i]->GetName();
+         name.Append("_clone");
+ //      tree_clone[i]->SetName(name.Data());
+         cout << tree_clone[i]->GetName() << endl;
+         i++;
+     }
+     delete li;
+     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
+ }
+ /**
+  * Create clone-trees
+  */
+ void PamLevel2::CreateCloneTrees(TFile *ofile){
+     ofile->cd();
+     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
+     cout << "Create new PAMELA trees "<<endl;
+     Int_t i=0;
+     if(TRK1||TRK2||TRKh){
+         tree_clone[i] = new TTree("Tracker","PAMELA tracker level2 data ");
+         if(TRK1) {
+             tree_clone[i]->Branch("TrkLevel1","TrkLevel1", GetPointerTo("TrkLevel1"));
+             tree_clone[i]->BranchRef();
+             cout << "Tracker      : branch TrkLevel1"<<endl;
+         };
+         if(TRK2) {
+             tree_clone[i]->Branch("TrkLevel2", "TrkLevel2",GetPointerTo("TrkLevel2"));
+             cout << "Tracker      : branch TrkLevel2"<<endl;
+         };
+         if(TRKh) {
+             tree_clone[i]->Branch("TrkHough","TrkHough", GetPointerTo("TrkHough"));
+             cout << "Tracker      : branch TrkHough"<<endl;
          };
-         if(ND && !ND__ok){
+         i++;
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing ND tree"<< endl;
+     }
-                 FLAG = false;
+     // Calorimeter
+     if(CAL1||CAL2){
+         tree_clone[i] = new TTree("Calorimeter","PAMELA calorimeter level2 data ");
+         if(CAL1) {
+             tree_clone[i]->Branch("CaloLevel1", "CaloLevel1", GetPointerTo("CaloLevel1"));
+             cout << "Calorimeter  : branch CaloLevel1"<<endl;
+         };
+         if(CAL2) {
+             tree_clone[i]->Branch("CaloLevel2","CaloLevel2", GetPointerTo("CaloLevel2"));
+             cout << "Calorimeter  : branch CaloLevel2"<<endl;
          };
-         if(AC && !AC__ok){
+         i++;
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing AC tree"<< endl;
+     }
-                 FLAG = false;
+     // ToF
+     if(TOF) {
+         tree_clone[i] = new TTree("ToF","PAMELA ToF level2 data ");
+         tree_clone[i]->Branch("ToFLevel2","ToFLevel2", GetPointerTo("ToFLevel2"));
+         cout << "ToF          : branch ToFLevel2"<<endl;
+         i++;
+     };
+     // Trigger
+     if(TRG) {
+         tree_clone[i] = new TTree("Trigger","PAMELA trigger level2 data ");
+         tree_clone[i]->Branch("TrigLevel2","TrigLevel2", GetPointerTo("TrigLevel2"));
+         cout << "Trigger      : branch TrigLevel2"<<endl;
+         i++;
+     };
+     // S4
+     if(S4) {
+         tree_clone[i] = new TTree("S4","PAMELA S4 level2 data ");
+         tree_clone[i]->Branch("S4Level2","S4Level2", GetPointerTo("S4Level2"));
+         cout << "S4           : branch S4Level2"<<endl;
+         i++;
+     };
+     // Neutron Detector
+     if(ND) {
+         tree_clone[i] = new TTree("NeutronD","PAMELA neutron detector level2 data ");
+         tree_clone[i]->Branch("NDLevel2","NDLevel2", GetPointerTo("NDLevel2"));
+         cout << "NeutronD     : branch NDLevel2"<<endl;
+         i++;
+     };
+     // Anticounters
+     if(AC) {
+         tree_clone[i] = new TTree("Anticounter","PAMELA anticounter detector level2 data ");
+         tree_clone[i]->Branch("AcLevel2","AcLevel2", GetPointerTo("AcLevel2"));
+         cout << "Anticounter  : branch AcLevel2"<<endl;
+         i++;
+     };
+     // OrbitalInfo
+     if(ORB) {
+         tree_clone[i] = new TTree("OrbitalInfo","PAMELA oribital info  ");
+         tree_clone[i]->Branch("OrbitalInfo","OrbitalInfo", GetPointerTo("OrbitalInfo"));
+         cout << "OrbitalInfo  : branch OrbitalInfo"<<endl;
+         i++;
+     };
+     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
+ }
+ /**
+  * Fill tree (created with CreateCloneTrees)
+  *
+  */
+ //void PamLevel2::FillNewPamTree(TTree *T){
+ void PamLevel2::FillCloneTrees(){
+     for(Int_t i=0; i<8; i++){
+         if(tree_clone[i])tree_clone[i]->Fill();
+     }
+ }
+ TTree* PamLevel2::GetCloneTree(TString name){
+     for(Int_t i=0; i<8; i++){
+         if(tree_clone[i]){
+             TString na = tree_clone[i]->GetName();
+             if(!name.CompareTo(na))return tree_clone[i];
          };
-         if(ORB && !ORB__ok){
+     }
-                 cout << "File: "<< f->GetName() <<" discarded ---- Missing ORB tree"<< endl;
+     return NULL;
-                 FLAG = false;
+ }
+ void PamLevel2::WriteCloneTrees(){
+     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
+     cout << "Write clones of PAMELA trees "<<endl;
+     for(Int_t i=0; i<8; i++){
+         if(tree_clone[i]){
+             cout << tree_clone[i]->GetName()<<endl;
+             tree_clone[i]->Write();
          };
+     }
-         return FLAG;
+     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
- };
+ }
+ /**
+  * Create a new (empty) Pamela trees
+  */
+ // TTree* PamLevel2::GetNewPamTree(){
+ //     if(tree_clone)return tree_clone;
+ //     TTree *Tout = 0;
+ //     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
+ //     cout << "Create new PAMELA trees "<<endl;
+ //     if(TRK1||TRK2||TRKh){
+ //      TTree *T = new TTree("Tracker_clone","PAMELA tracker level2 data ");
+ //      if(TRK1) {
+ //          trk1_clone = new TrkLevel1();
+ //          T->Branch("TrkLevel1","TrkLevel1", &trk1_clone);
+ //          T->BranchRef();
+ //          cout << "Tracker      : branch TrkLevel1"<<endl;
+ //      };
+ //      if(TRK2) {
+ //          trk2_clone = new TrkLevel2();
+ //          T->Branch("TrkLevel2", "TrkLevel2",&trk2_clone);
+ //          cout << "Tracker      : branch TrkLevel2"<<endl;
+ //      };
+ //      if(TRKh) {
+ //          trkh_clone = new TrkHough();
+ //          T->Branch("TrkHough","TrkHough", &trkh_clone);
+ //          cout << "Tracker      : branch TrkHough"<<endl;
+ //      };
+ //      if(!Tout)Tout=T;
+ //      else Tout->AddFriend("Tracker_clone");
+ //     }
+ //     // Calorimeter
+ //     if(CAL1||CAL2){
+ //      TTree *C = new TTree("Calorimeter_clone","PAMELA calorimeter level2 data ");
+ //      if(CAL1) {
+ //          calo1_clone = new CaloLevel1();
+ //          C->Branch("CaloLevel1", "CaloLevel1", &calo1_clone);
+ //          cout << "Calorimeter  : branch CaloLevel1"<<endl;
+ //      };
+ //      if(CAL2) {
+ //          calo2_clone = new CaloLevel2();
+ //          C->Branch("CaloLevel2","CaloLevel2", &calo2_clone);
+ //          cout << "Calorimeter  : branch CaloLevel2"<<endl;
+ //      };
+ //      if(!Tout)Tout=C;
+ //      else Tout->AddFriend("Calorimeter_clone");
+ //     }
+ //     // ToF
+ //     if(TOF) {
+ //      TTree *O = new TTree("ToF_clone","PAMELA ToF level2 data ");
+ //      tof_clone = new ToFLevel2();
+ //      O->Branch("ToFLevel2","ToFLevel2", &tof_clone);
+ //      cout << "ToF          : branch ToFLevel2"<<endl;
+ //      if(!Tout)Tout=O;
+ //      else Tout->AddFriend("ToF_clone");
+ //     };
+ //     // Trigger
+ //     if(TRG) {
+ //      TTree *R = new TTree("Trigger_clone","PAMELA trigger level2 data ");
+ //      trig_clone = new TrigLevel2();
+ //      R->Branch("TrigLevel2","TrigLevel2", &trig_clone);
+ //      cout << "Trigger      : branch TrigLevel2"<<endl;
+ //      if(!Tout)Tout=R;
+ //      else Tout->AddFriend("Trigger_clone");
+ //     };
+ //     // S4
+ //     if(S4) {
+ //      TTree *S = new TTree("S4_clone","PAMELA S4 level2 data ");
+ //      s4_clone = new S4Level2();
+ //      S->Branch("S4Level2","S4Level2", &s4_clone);
+ //      cout << "S4           : branch S4Level2"<<endl;
+ //      if(!Tout)Tout=S;
+ //      else Tout->AddFriend("S4_clone");
+ //     };
+ //     // Neutron Detector
+ //     if(ND) {
+ //      TTree *N = new TTree("NeutronD_clone","PAMELA neutron detector level2 data ");
+ //      nd_clone = new NDLevel2();
+ //      N->Branch("NDLevel2","NDLevel2", &nd_clone);
+ //      cout << "NeutronD     : branch NDLevel2"<<endl;
+ //      if(!Tout)Tout=N;
+ //      else Tout->AddFriend("NeutronD_clone");
+ //     };
+ //     // Anticounters
+ //     if(AC) {
+ //      TTree *A = new TTree("Anticounter_clone","PAMELA anticounter detector level2 data ");
+ //      ac_clone = new AcLevel2();
+ //      A->Branch("AcLevel2","AcLevel2", &ac_clone);
+ //      cout << "Anticounter  : branch AcLevel2"<<endl;
+ //      if(!Tout)Tout=A;
+ //      else Tout->AddFriend("Anticounter_clone");
+ //     };
+ //     // OrbitalInfo
+ //     if(ORB) {
+ //      TTree *B = new TTree("OrbitalInfo_clone","PAMELA oribital info  ");
+ //      orb_clone = new OrbitalInfo();
+ //      B->Branch("OrbitalInfo","OrbitalInfo", &orb_clone);
+ //      cout << "OrbitalInfo  : branch OrbitalInfo"<<endl;
+ //      if(!Tout)Tout=B;
+ //      else Tout->AddFriend("OrbitalInfo_clone");
+ //     };
+ //     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
+ //     tree_clone = Tout;
+ //     tree_clone->SetDirectory(0);
+ //     return Tout;
+ // }
+ // /**
+ //  * Fill a tree (created with GetNewPamTree)
+ //  *
+ //  */
+ // //void PamLevel2::FillNewPamTree(TTree *T){
+ // void PamLevel2::FillNewPamTree(){
+ //     if(trk1_clone)  *trk1_clone = *trk1_obj;
+ //     if(trk2_clone){
+ //      trk2_clone->Clear();
+ //      trk2_obj->Copy(*trk2_clone);
+ // //   *trk2_clone = *trk2_obj;
+ //     }
+ //     if(trkh_clone)  *trkh_clone = *trkh_obj;
+ //     if(calo1_clone){
+ // //   *calo1_clone = *calo1_obj;
+ //      calo1_clone->Clear();
+ //      calo1_obj->Copy(*calo1_clone);
+ //     }
+ //     if(calo2_clone){
+ // //   *calo2_clone = *calo2_obj;
+ //      calo2_clone->Clear();
+ //      calo2_obj->Copy(*calo2_clone);
+ //     }
+ //     if(tof_clone)   *tof_clone  = *tof_obj;
+ //     if(trig_clone)  *trig_clone = *trig_obj;
+ //     if(s4_clone)    *s4_clone   = *s4_obj;
+ //     if(nd_clone)    *nd_clone   = *nd_obj;
+ //     if(ac_clone)    *ac_clone   = *ac_obj;
+ //     if(orb_clone)   *orb_clone  = *orb_obj;
+ //     TTree *T = tree_clone;
+ //     T->Fill(); //fill main tree
+ // //    cout<<T->IsA()->GetName()<<" "<<T->GetName()<<endl;
+ //     TList *li = T->GetListOfFriends();
+ //     TIter next(li);
+ //     TFriendElement* T_friend=0;
+ //     while( (T_friend = (TFriendElement*)next()) ){
+ // //   cout<<T_friend->IsA()->GetName()<<" "<<T_friend->GetName()<<hex << T_friend->GetTree() << dec<<endl;
+ //      T_friend->GetTree()->Fill();//fill friends
+ //     }
+ // }

 Legend:



Removed from v.1.5
 


changed lines


 
Added in v.1.19
 Legend:



Removed from v.1.5
 


changed lines


 
Added in v.1.19
-Removed from v.1.5
+Added in v.1.19

	ViewVC Help
Powered by ViewVC 1.1.23